Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/cjep_sun2x]: src Work towards X sources building statically and on sun2.
details: https://anonhg.NetBSD.org/src/rev/4ef6ab755fea
branches: cjep_sun2x
changeset: 1024904:4ef6ab755fea
user: cjep <cjep%NetBSD.org@localhost>
date: Wed Jun 02 14:22:55 2021 +0000
description:
Work towards X sources building statically and on sun2.
Setup specific make variables to contain the full set of library
flags (LDADD and DPADD) for programs in the xorg suite. Each list
contains all needed dependencies so that the programs will build
statically.
Suggested by mrg@
diffstat:
share/mk/bsd.x11.mk | 89 +++++++++-
sys/arch/x68k/include/cdefs.h | 2 +-
sys/arch/x68k/include/cpufunc.h | 2 +-
sys/arch/x68k/include/ieeefp.h | 2 +-
sys/arch/x68k/include/profile.h | 2 +-
sys/arch/x68k/include/setjmp.h | 2 +-
sys/external/gpl2/dts/dist/include/dt-bindings/clock/sun50i-h6-r-ccu.h | 5 +-
sys/external/gpl2/dts/dist/include/dt-bindings/reset/sun50i-h6-r-ccu.h | 5 +-
8 files changed, 97 insertions(+), 12 deletions(-)
diffs (174 lines):
diff -r 215289c351f9 -r 4ef6ab755fea share/mk/bsd.x11.mk
--- a/share/mk/bsd.x11.mk Wed Jun 02 11:32:24 2021 +0000
+++ b/share/mk/bsd.x11.mk Wed Jun 02 14:22:55 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.138 2021/04/27 04:02:09 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.138.4.1 2021/06/02 14:22:55 cjep Exp $
.include <bsd.init.mk>
@@ -172,6 +172,93 @@
LDFLAGS+= -Wl,-rpath,${X11USRLIBDIR} -L=${X11USRLIBDIR}
+# Library adds including full dependencies needed for static linking
+# Avoids repetition where possible
+#
+XLIBLDADD_XAU= -lXau
+XLIBDPADD_XAU= ${LIBXAU}
+
+XLIBLDADD_FC= -lfontconfig -lfreetype -lexpat -lz -lbz2
+XLIBDPADD_FC= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} \
+ ${LIBZ} ${LIBBZ2}
+
+# XAU+
+#
+XLIBLDADD_XCB= -lxcb ${XLIBLDADD_XAU} -lXdmcp
+XLIBDPADD_XCB= ${LIBXCB} ${XLIBDPADD_XAU} ${LIBXDMCP}
+
+# XCB+
+#
+XLIBLDADD_XCB_ATOM= -lxcb-atom ${XLIBLDADD_XCB}
+XLIBDPADD_XCB_ATOM= ${LIBXCB-ATOM} ${XLIBDPADD_XCB}
+
+XLIBLDADD_XCB_SHAPE= -lxcb-shape ${XLIBLDADD_XCB}
+XLIBDPADD_XCB_SHAPE= ${LIBXCB-SHAPE} ${XLIBDPADD_XCB}
+
+# X11 & XEXT
+#
+XLIBLDADD_X11= -lX11 ${XLIBLDADD_XCB}
+XLIBDPADD_X11= ${LIBX11} ${XLIBDPADD_XCB}
+
+XLIBLDADD_XEXT= -lXext ${XLIBLDADD_X11}
+XLIBDPADD_XEXT= ${LIBXEXT} ${XLIBDPADD_X11}
+
+# X11+
+#
+XLIBLDADD_XT= -lXt ${XLIBLDADD_X11} -lSM -lICE
+XLIBDPADD_XT= ${LIBXT} ${XLIBDPADD_X11} ${LIBSM} ${LIBICE}
+
+# XEXT+
+#
+XLIBLDADD_XI= -lXi ${XLIBLDADD_XEXT}
+XLIBDPADD_XI= ${LIBXI} ${XLIBDPADD_XEXT}
+
+XLIBLDADD_XV= -lXv ${XLIBLDADD_XEXT}
+XLIBDPADD_XV= ${LIBXV} ${XLIBDPADD_XEXT}
+
+XLIBLDADD_XF86DGA= -lXxf86dga ${XLIBLDADD_XEXT}
+XLIBDPADD_XF86DGA= ${LIBXXF86DGA} ${XLIBDPADD_XEXT}
+
+XLIBLDADD_XRENDER= -lXrender ${XLIBLDADD_XEXT}
+XLIBDPADD_XRENDER= ${LIBXRENDER} ${XLIBDPADD_XEXT}
+
+XLIBLDADD_XCURSOR= -lXcursor ${XLIBLDADD_XRENDER}
+XLIBDPADD_XCURSOR= ${LIBXCURSOR} ${XLIBDPADD_XRENDER}
+
+XLIBLDADD_XRANDR= -lXrandr ${XLIBLDADD_XRENDER}
+XLIBDPADD_XRANDR= ${LIBXRANDR} ${XLIBDPADD_XRENDER}
+
+XLIBLDADD_XPM= -lXpm ${XLIBLDADD_XEXT}
+XLIBDPADD_XPM= ${LIBXPM} ${XLIBDPADD_XEXT}
+
+XLIBLDADD_XSS= -lXss ${XLIBLDADD_XEXT}
+XLIBDPADD_XSS= ${LIBXSS} ${XLIBDPADD_XEXT}
+
+XLIBLDADD_KDFILE= -lxkbfile ${XLIBLDADD_XEXT}
+XLIBDPADD_KDFILE= ${LIBXKDFILE} ${XLIBCPADD_XEXT}
+
+# XRANDR & FC+
+#
+XLIBLDADD_XFT= -lXft ${XLIBLDADD_XRANDR} ${XLIBLDADD_FC}
+XLIBDPADD_XFT= ${LIBXFT} ${XLIBDPADD_XRANDR} ${XLIBDPADD_FC}
+
+# XMU and XMUU depend on XT and XEXT which have overlapping dependencies
+#
+XLIBLDADD_XT_XEXT= -lXt ${XLIBLDADD_XEXT} -lSM -lICE
+XLIBDPADD_XT_XEXT= ${LIBXT} ${XLIBDPADD_XEXT} ${LIBSM} ${LIBICE}
+
+XLIBLDADD_XMU= -lXmu ${XLIBLDADD_XT_XEXT}
+XLIBDPADD_XMU= ${LIBXMU} ${XLIBDPADD_XT_XEXT}
+XLIBLDADD_XMUU= -lXmuu ${XLIBLDADD_XT_XEXT}
+XLIBDPADD_XMUU= ${LIBXMUU} ${XLIBDPADD_XT_XEXT}
+
+# XAW depends on XMU and XPM which have overlapping dependencies
+#
+XLIBLDADD_XMU_XPM= -lXmu -lXt -lXpm ${XLIBLDADD_XT_XEXT}
+XLIBDPADD_XMU_XPM= ${LIBXMU} ${LIBXT} ${LIBXPM} ${XLIBDPADD_XT_XEXT}
+
+XLIBLDADD_XAW= -lXaw ${XLIBLDADD_XMU_XPM}
+XLIBCPADD_XAW= ${LIBXAW} ${XLIBDPADD_XMU_XPM}
#
# .cpp -> "" handling
diff -r 215289c351f9 -r 4ef6ab755fea sys/arch/x68k/include/cdefs.h
--- a/sys/arch/x68k/include/cdefs.h Wed Jun 02 11:32:24 2021 +0000
+++ b/sys/arch/x68k/include/cdefs.h Wed Jun 02 14:22:55 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.1 1996/05/05 12:17:15 oki Exp $ */
+/* $NetBSD: cdefs.h,v 1.1.1.1 1996/05/05 12:17:03 oki Exp $ */
#ifndef _MACHINE_CDEFS_H_
#define _MACHINE_CDEFS_H_
diff -r 215289c351f9 -r 4ef6ab755fea sys/arch/x68k/include/cpufunc.h
--- a/sys/arch/x68k/include/cpufunc.h Wed Jun 02 11:32:24 2021 +0000
+++ b/sys/arch/x68k/include/cpufunc.h Wed Jun 02 14:22:55 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.h,v 1.1 1996/05/05 12:17:15 oki Exp $ */
+/* $NetBSD: cpufunc.h,v 1.1.1.1 1996/05/05 12:17:03 oki Exp $ */
/*
* Functions to provide access to special cpu instructions.
diff -r 215289c351f9 -r 4ef6ab755fea sys/arch/x68k/include/ieeefp.h
--- a/sys/arch/x68k/include/ieeefp.h Wed Jun 02 11:32:24 2021 +0000
+++ b/sys/arch/x68k/include/ieeefp.h Wed Jun 02 14:22:55 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ieeefp.h,v 1.1 1996/05/05 12:17:14 oki Exp $ */
+/* $NetBSD: ieeefp.h,v 1.1.1.1 1996/05/05 12:17:03 oki Exp $ */
/* Just use the common m68k definition */
#include <m68k/ieeefp.h>
diff -r 215289c351f9 -r 4ef6ab755fea sys/arch/x68k/include/profile.h
--- a/sys/arch/x68k/include/profile.h Wed Jun 02 11:32:24 2021 +0000
+++ b/sys/arch/x68k/include/profile.h Wed Jun 02 14:22:55 2021 +0000
@@ -1,3 +1,3 @@
-/* $NetBSD: profile.h,v 1.1 1996/05/05 12:17:14 oki Exp $ */
+/* $NetBSD: profile.h,v 1.1.1.1 1996/05/05 12:17:03 oki Exp $ */
#include <m68k/profile.h>
diff -r 215289c351f9 -r 4ef6ab755fea sys/arch/x68k/include/setjmp.h
--- a/sys/arch/x68k/include/setjmp.h Wed Jun 02 11:32:24 2021 +0000
+++ b/sys/arch/x68k/include/setjmp.h Wed Jun 02 14:22:55 2021 +0000
@@ -1,3 +1,3 @@
-/* $NetBSD: setjmp.h,v 1.1 1996/05/05 12:17:15 oki Exp $ */
+/* $NetBSD: setjmp.h,v 1.1.1.1 1996/05/05 12:17:03 oki Exp $ */
#include <m68k/setjmp.h>
diff -r 215289c351f9 -r 4ef6ab755fea sys/external/gpl2/dts/dist/include/dt-bindings/clock/sun50i-h6-r-ccu.h
--- a/sys/external/gpl2/dts/dist/include/dt-bindings/clock/sun50i-h6-r-ccu.h Wed Jun 02 11:32:24 2021 +0000
+++ b/sys/external/gpl2/dts/dist/include/dt-bindings/clock/sun50i-h6-r-ccu.h Wed Jun 02 14:22:55 2021 +0000
@@ -1,8 +1,7 @@
-/* $NetBSD: sun50i-h6-r-ccu.h,v 1.1.1.1 2018/06/27 16:27:08 jmcneill Exp $ */
-
-/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2017 Icenowy Zheng <icenowy%aosc.xyz@localhost>
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ or MIT)
*/
#ifndef _DT_BINDINGS_CLK_SUN50I_H6_R_CCU_H_
diff -r 215289c351f9 -r 4ef6ab755fea sys/external/gpl2/dts/dist/include/dt-bindings/reset/sun50i-h6-r-ccu.h
--- a/sys/external/gpl2/dts/dist/include/dt-bindings/reset/sun50i-h6-r-ccu.h Wed Jun 02 11:32:24 2021 +0000
+++ b/sys/external/gpl2/dts/dist/include/dt-bindings/reset/sun50i-h6-r-ccu.h Wed Jun 02 14:22:55 2021 +0000
@@ -1,8 +1,7 @@
-/* $NetBSD: sun50i-h6-r-ccu.h,v 1.1.1.1 2018/06/27 16:27:08 jmcneill Exp $ */
-
-/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
/*
* Copyright (C) 2016 Icenowy Zheng <icenowy%aosc.xyz@localhost>
+ *
+ * SPDX-License-Identifier: (GPL-2.0+ or MIT)
*/
#ifndef _DT_BINDINGS_RST_SUN50I_H6_R_CCU_H_
Home |
Main Index |
Thread Index |
Old Index