pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

xemu: take the usual pkgsrc LDPATH and CFLAGS into account.



Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Wed Sep 23 19:31:54 2026 +0200
Changeset:	326157d065cd5d43b63525e2a32e4c198e523ee9

Modified Files:
	xemu/Makefile
	xemu/distinfo
Added Files:
	xemu/patches/patch-build_Makefile

Log Message:
xemu: take the usual pkgsrc LDPATH and CFLAGS into account.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=326157d065cd5d43b63525e2a32e4c198e523ee9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 xemu/Makefile                     |  6 ++++--
 xemu/distinfo                     |  1 +
 xemu/patches/patch-build_Makefile | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diffs:
diff --git a/xemu/Makefile b/xemu/Makefile
index fec2245fd5..08ebd1f135 100644
--- a/xemu/Makefile
+++ b/xemu/Makefile
@@ -17,8 +17,10 @@ USE_LANGUAGES+=	c
 
 REPLACE_BASH+=	build/configure/configure
 
-MAKE_ENV+=	DESTDIR=${DESTDIR}
-MAKE_ENV+=	SDL2_RPATH=${COMPILER_RPATH_FLAG},${BUILDLINK_PREFIX.SDL2}/lib
+MAKE_ENV+=	DESTDIR=${DESTDIR:Q}
+MAKE_ENV+=	SDL2_RPATH=${COMPILER_RPATH_FLAG},${BUILDLINK_PREFIX.SDL2:Q}/lib
+MAKE_ENV+=	PKGSRC_CFLAGS=${CFLAGS:Q}
+MAKE_ENV+=	PKGSRC_LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=	RELEASE=yes
 
 INSTALLATION_DIRS+=	share/xemu-lgb
diff --git a/xemu/distinfo b/xemu/distinfo
index 298bd276c0..2f3e9f4677 100644
--- a/xemu/distinfo
+++ b/xemu/distinfo
@@ -3,5 +3,6 @@ $NetBSD$
 BLAKE2s (xemu-0.0.2026.01.29-40dfef0d1d5f56be2469492715c12bdb32c75b67.tar.gz) = e04c543a23b830307d529344e884cfb536f12a656de3de3010a1c4d7c0993dc8
 SHA512 (xemu-0.0.2026.01.29-40dfef0d1d5f56be2469492715c12bdb32c75b67.tar.gz) = 4733fc15a1bbfba6c48f0be2bf4b7910aa298bb8e1db98da7adcb596d660a295e29ec813a69012c6dcd3cc07ef1f27f70c2a0fcd13c10dafd43b1e6c7c5253cb
 Size (xemu-0.0.2026.01.29-40dfef0d1d5f56be2469492715c12bdb32c75b67.tar.gz) = 1388063 bytes
+SHA1 (patch-build_Makefile) = 80814e3b3fb8721566b0a3e698c0a22389a42b7a
 SHA1 (patch-targets_cvic20_Makefile) = f9ff8f0475d5a732d8666a1b59f85bb298906ca2
 SHA1 (patch-targets_tvc_Makefile) = 33d853667352a2879fa355940ec1f39da6bce364
diff --git a/xemu/patches/patch-build_Makefile b/xemu/patches/patch-build_Makefile
new file mode 100644
index 0000000000..0043d351a0
--- /dev/null
+++ b/xemu/patches/patch-build_Makefile
@@ -0,0 +1,17 @@
+$NetBSD$
+
+- Take the usual pkgsrc LDFLAGS into account.
+
+--- build/Makefile.common.orig	2026-01-29 22:59:30.000000000 +0000
++++ build/Makefile.common
+@@ -102,8 +102,8 @@ CONFIG_CFLAGS		+= -mmacosx-version-min=$
+ CONFIG_CFLAGS_LINK	+= -mmacosx-version-min=$(MACMINVER)
+ endif
+ 
+-CFLAGS			= $(CONFIG_CFLAGS) $(CFLAGS_OPT) $(CFLAGS_TARGET) -I. -I$(TOPDIR) -include build/configure/config-$(ARCH).h
+-LDFLAGS			= $(CONFIG_CFLAGS_LINK) $(LDFLAGS_TARGET) $(DLSYM_LIBS)
++CFLAGS			= $(PKGSRC_CFLAGS) $(CONFIG_CFLAGS) $(CFLAGS_OPT) $(CFLAGS_TARGET) -I. -I$(TOPDIR) -include build/configure/config-$(ARCH).h
++LDFLAGS			= $(PKGSRC_LDFLAGS) $(CONFIG_CFLAGS_LINK) $(LDFLAGS_TARGET) $(DLSYM_LIBS)
+ 
+ ifeq ($(IS_TTY), yes)
+ PROGRESS_MARKER_START = "`cat $(TOPDIR)/build/compilation-mark-start-seq.ansi`"


Home | Main Index | Thread Index | Old Index