Author: roam-guest
Date: 2011-04-11 11:04:25 +0000 (Mon, 11 Apr 2011)
New Revision: 12100
Added:
packages/trunk/netrek-client-cow/debian/patches/004-honor-flags.patch
Modified:
packages/trunk/netrek-client-cow/debian/changelog
packages/trunk/netrek-client-cow/debian/patches/series
packages/trunk/netrek-client-cow/debian/rules
Log:
Honor CPPFLAGS, CFLAGS and LDFLAGS.
Modified: packages/trunk/netrek-client-cow/debian/changelog
===================================================================
--- packages/trunk/netrek-client-cow/debian/changelog 2011-04-11 11:03:52 UTC
(rev 12099)
+++ packages/trunk/netrek-client-cow/debian/changelog 2011-04-11 11:04:25 UTC
(rev 12100)
@@ -19,6 +19,9 @@
* Add the 003-typos patch to fix some typographical and grammatical
errors.
* Bump Standards-Version to 3.9.2 with no changes.
+ * Let the build system honor CPPFLAGS, CFLAGS and LDFLAGS
+ - export them in the rules file
+ - add the 004-honor-flags patch
-- Peter Pentchev <[email protected]> Fri, 08 Apr 2011 16:06:48 +0300
Added: packages/trunk/netrek-client-cow/debian/patches/004-honor-flags.patch
===================================================================
--- packages/trunk/netrek-client-cow/debian/patches/004-honor-flags.patch
(rev 0)
+++ packages/trunk/netrek-client-cow/debian/patches/004-honor-flags.patch
2011-04-11 11:04:25 UTC (rev 12100)
@@ -0,0 +1,66 @@
+Description: Honor CPPFLAGS, CFLAGS and LDFLAGS.
+Forwarded: no
+Author: Peter Pentchev <[email protected]>
+Last-Update: 2011-04-11
+
+Index: b/system.mk.in
+===================================================================
+--- a/system.mk.in
++++ b/system.mk.in
+@@ -112,16 +112,18 @@
+
+ SHARED = $(SL_CFLAGS)
+ INCDIRS = $(MPINC) $(INCS)
+-CFLAGS = $(OPT) $(EXTRACFLAGS) $(RSA_FLAGS) $(INCDIRS)
+-LFLAGS = -g $(EXTRALINKFLAGS)
++CFLAGS ?= $(OPT)
++CFLAGS += $(EXTRACFLAGS) $(RSA_FLAGS) $(INCDIRS)
++LDFLAGS ?= -g
++LDFLAGS += $(EXTRALINKFLAGS)
+ LIBRARIES = $(LMP) $(LIBS) $(EXTRALIBS) $(SDL_LIBS) $(SDL_MIXER_LIBS)
$(XXF86VM_LIBS) $(IMLIB2_LIBS)
+
+ netrek-client-cow: $(RSAOBJ) $(PMAKE) null $(ROBJ) $(MAINOBJ) $(INPUTOBJ)
$(X11OBJ) $(WIN32OBJ) $(RANDOMOBJ) cflags.c
+- $(CC) $(LFLAGS) -o netrek-client-cow $(ROBJ) $(RSAOBJ) $(INPUTOBJ) \
++ $(CC) $(LDFLAGS) -o netrek-client-cow $(ROBJ) $(RSAOBJ) $(INPUTOBJ) \
+ $(MAINOBJ) $(X11OBJ) $(WIN32OBJ) $(RANDOMOBJ) $(LIBRARIES)
+
+ netrek.shared: done.libcow $(MAINOBJ) $(COWAPI)
+- $(CC) $(LFLAGS) $(MAINOBJ) -L. -lcow $(LIBS) -o netrek.shared
++ $(CC) $(LDFLAGS) $(MAINOBJ) -L. -lcow $(LIBS) -o netrek.shared
+
+ done.libcow: $(PMAKE) $(ROBJ) $(RSAOBJ) $(INPUTOBJ) $(X11OBJ) $(WIN32OBJ)
$(RANDOMOBJ)
+ $(CC) $(ROBJ) $(RSAOBJ) $(INPUTOBJ) \
+@@ -142,26 +144,26 @@
+ $(MAKE) newkey
+
+ mkkey: mkkey.c $(RANDOMOBJ) defs.h
+- $(CC) $(CFLAGS) $(MPINC) $(MPLIB) -o mkkey mkkey.c $(RANDOMOBJ)
$(LIBRARIES)
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(MPINC) $(MPLIB) -o mkkey
mkkey.c $(RANDOMOBJ) $(LIBRARIES)
+
+ randomize: randomize.c $(RANDOMOBJ) defs.h
+- $(CC) $(OPT) -o randomize randomize.c $(RANDOMOBJ) $(LIBRARIES)
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o randomize randomize.c
$(RANDOMOBJ) $(LIBRARIES)
+
+ sound.o: sound.c
+- $(CC) $(SDL_CFLAGS) -c sound.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(SDL_CFLAGS) -c sound.c
+
+ random.o: random.c
+- $(CC) -c -O random.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c random.c
+
+ strdup.o: strdup.c
+- $(CC) -c -O strdup.c
++ $(CC) $(CPPFLAGS) $(CFLAGS) -c strdup.c
+
+ cflags.c: mkcflags
+- ./mkcflags "$(CC) $(CFLAGS)" "$(ARCH)" > cflags.c
++ ./mkcflags "$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)" "$(ARCH)" >
cflags.c
+ echo char cwho[]=$(CWHO)\; >> cflags.c
+
+ mkcflags: mkcflags.c system.mk null patchlevel.h version.h
+- $(CC) $(CFLAGS) -o mkcflags mkcflags.c $(LIBRARIES)
++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o mkcflags mkcflags.c
$(LIBRARIES)
+
+ tags: $(RSRC) $(RSASRC)
+ ctags $(RSRC) $(RSASRC) $(INCLUDES)
Modified: packages/trunk/netrek-client-cow/debian/patches/series
===================================================================
--- packages/trunk/netrek-client-cow/debian/patches/series 2011-04-11
11:03:52 UTC (rev 12099)
+++ packages/trunk/netrek-client-cow/debian/patches/series 2011-04-11
11:04:25 UTC (rev 12100)
@@ -1,3 +1,4 @@
001-configure-gmp-version.patch
002-make-reallyclean.patch
003-typos.patch
+004-honor-flags.patch
Modified: packages/trunk/netrek-client-cow/debian/rules
===================================================================
--- packages/trunk/netrek-client-cow/debian/rules 2011-04-11 11:03:52 UTC
(rev 12099)
+++ packages/trunk/netrek-client-cow/debian/rules 2011-04-11 11:04:25 UTC
(rev 12100)
@@ -14,7 +14,9 @@
CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
+LDFLAGS= -Wl,-z,defs
+export CPPFLAGS CFLAGS LDFLAGS
config.status: configure
dh_testdir
@@ -29,9 +31,7 @@
--bindir=\$${prefix}/games \
--datadir=\$${prefix}/share/games \
--mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- CFLAGS="$(CFLAGS)" \
- LDFLAGS="-Wl,-z,defs"
+ --infodir=\$${prefix}/share/info
build: build-stamp
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
