Build fixups after upstream merge

ravynsoft · Oct 11, 2024 · 31f9f27 · 31f9f27
1 parent 9e75788
commit 31f9f27
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 3 deletions.
diff --git a/Frameworks/AppKit/xkeyboard-config/Makefile b/Frameworks/AppKit/xkeyboard-config/Makefile
@@ -11,7 +11,7 @@ NINJA?=         ${OBJTOP}/tmp/usr/bin/ninja
 
 all: build
 build:
-	LD_LIBRARY_PATH=${OBJTOP}/tmp/usr/lib \
+	LD_LIBRARY_PATH=${OBJTOP}/tmp/usr/lib:${OBJTOP}/tmp/lib \
         PYTHONPATH=${OBJTOP}/tmp/usr/lib/python3.10 \
         PATH=${OBJTOP}/tmp/usr/bin:${OBJTOP}/tmp/legacy/bin:$${PATH} \
 	CFLAGS="${CFLAGS:C/-Werror=.* //g}" \
@@ -21,7 +21,7 @@ build:
 	-Dxkb-base=/System/Library/KeyboardLayout -Dcompat-rules=false \
 	${MAKEOBJDIR} ${.CURDIR}
 	sed -i.bak -e 's@-I/usr/include@@g' ${MAKEOBJDIR}/build.ninja
-	LD_LIBRARY_PATH=${OBJTOP}/tmp/usr/lib:${OBJTOP}/tmp/obj-tools/lib \
+	LD_LIBRARY_PATH=${OBJTOP}/tmp/usr/lib:${OBJTOP}/tmp/lib:${OBJTOP}/tmp/obj-tools/lib \
         PYTHONPATH=${OBJTOP}/tmp/usr/lib/python3.10 \
 	PATH=${OBJTOP}/tmp/usr/bin:${OBJTOP}/tmp/legacy/bin:${OBJTOP}/usr.bin/clang/llvm-ar:$$PATH \
 	${NINJA} -C ${MAKEOBJDIR}

diff --git a/Frameworks/CoreText/fontconfig/Makefile b/Frameworks/CoreText/fontconfig/Makefile
@@ -28,7 +28,7 @@ LIBXML2_CFLAGS=  -I${SRCTOP}/lib/libxml2/include \
 LIBXML2_LIBS=	 -L${OBJTOP}/lib/libxml2 -lxml2
 LDFLAGS+=	 ${FREETYPE_LIBS} ${LIBXML2_LIBS}
 
-LD_LIBRARY_PATH+= ${OBJTOP}/Frameworks/CFNetwork/CFNetwork.framework:${OBJTOP}/Frameworks/CoreFoundation/CoreFoundation.framework:${OBJTOP}/Frameworks/Foundation/Foundation.framework:${OBJTOP}/Frameworks/Onyx2D/Onyx2D.framework:${OBJTOP}/tmp/usr/lib
+LD_LIBRARY_PATH+= ${OBJTOP}/Frameworks/CFNetwork/CFNetwork.framework:${OBJTOP}/Frameworks/CoreFoundation/CoreFoundation.framework:${OBJTOP}/Frameworks/Foundation/Foundation.framework:${OBJTOP}/Frameworks/Onyx2D/Onyx2D.framework:${OBJTOP}/tmp/usr/lib:${OBJTOP}/tmp/lib:${OBJTOP}/tmp/usr/lib
 .export LD_LIBRARY_PATH FREETYPE_CFLAGS FREETYPE_LIBS
 .export LIBXML2_CFLAGS LIBXML2_LIBS
 

diff --git a/Frameworks/OpenGL/Makefile b/Frameworks/OpenGL/Makefile
@@ -28,6 +28,7 @@ CFLAGS+= -I${SRCTOP}/Frameworks/Foundation/Headers
 CFLAGS+= -I${.CURDIR}/libpciaccess/include
 LDFLAGS+= -Llibdrm -Llibpciaccess -ldrm -lpciaccess -lstdc++ -lstdthreads \
 	  -Wl,--no-as-needed -Wl,-R\$$ORIGIN
+LD_LIBRARY_PATH+= ${OBJTOP}/tmp/lib
 LD_LIBRARY_PATH+= ${OBJTOP}/tmp/usr/lib
 .export LD_LIBRARY_PATH
 

diff --git a/Frameworks/OpenGL/libdrm/Makefile b/Frameworks/OpenGL/libdrm/Makefile
@@ -48,6 +48,11 @@ CFLAGS+=        -DHAVE_INTEL
 
 LDFLAGS+=       -L${MAKEOBJDIR}/../libpciaccess -lpciaccess -Wl,-R\$$ORIGIN
 
+# Newly-built ar might need libmd and liblzma from the updated base
+# We also need the python libs we just built
+LD_LIBRARY_PATH=	${OBJTOP}/tmp/lib:${OBJTOP}/tmp/usr/lib
+.export LD_LIBRARY_PATH
+
 WARNS?=	2
 
 config.h: .PHONY

diff --git a/Frameworks/OpenGL/libpciaccess/Makefile b/Frameworks/OpenGL/libpciaccess/Makefile
@@ -29,6 +29,10 @@ LDFLAGS+=       -lz
 
 WARNS?=	2
 
+# Newly-built ar might need libmd and liblzma from the updated base
+LD_LIBRARY_PATH+=	${OBJTOP}/tmp/lib
+.export LD_LIBRARY_PATH
+
 config.h: .PHONY
 	echo >${.TARGET}
 

diff --git a/gnu/usr.bin/gmake/Makefile b/gnu/usr.bin/gmake/Makefile
@@ -19,6 +19,7 @@ CONFIGURE_ENV+=         AUTOCONF=/usr/bin/true
 CONFIGURE_ENV+=         AUTOMAKE=/usr/bin/true
 CONFIGURE_ENV+=         AUTOHEADER=/usr/bin/true
 CONFIGURE_ENV+=         MAKEINFO=/usr/bin/true
+CONFIGURE_ENV+=		LDFLAGS="-framework Foundation"
 
 all: gnu_configure .WAIT build
 build: