[Glibc-bsd-commits] r3361 - in trunk/ufsutils/debian: . patches

[Guillem Jover]

Author: guillem
Date: 2011-05-30 05:54:31 +0000 (Mon, 30 May 2011)
New Revision: 3361

Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/patches/99_makefiles.patch
Log:
Honour CPPFLAGS and LDFLAGS and do not link with CFLAGS

Patch-by: Peter Pentchev <roam at ringlet.net>


Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2011-05-30 05:41:00 UTC (rev 3360)
+++ trunk/ufsutils/debian/changelog	2011-05-30 05:54:31 UTC (rev 3361)
@@ -27,6 +27,7 @@
   [ Peter Pentchev ]
   * Remove duplicate section “utils” from ufsutils binary package.
   * Remove XC- prefix from Package-Type.
+  * Honour CPPFLAGS and LDFLAGS and do not link with CFLAGS.
 
  -- Robert Millan <rmh at debian.org>  Thu, 27 Jan 2011 16:22:17 +0100
 

Modified: trunk/ufsutils/debian/patches/99_makefiles.patch
===================================================================
--- trunk/ufsutils/debian/patches/99_makefiles.patch	2011-05-30 05:41:00 UTC (rev 3360)
+++ trunk/ufsutils/debian/patches/99_makefiles.patch	2011-05-30 05:54:31 UTC (rev 3361)
@@ -76,17 +76,17 @@
 +# General rules
 +
 +%.lo: %.c
-+	$(CC) -o $@ $(ALL_CFLAGS) $(CFLAGS) $(INCLUDES) -DPIC -fPIC -c $<
++	$(CC) -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $(CFLAGS) $(INCLUDES) -DPIC -fPIC -c $<
 +
 +%.o: %.c
-+	$(CC) -o $@ $(ALL_CFLAGS) $(CFLAGS) $(INCLUDES) -c $<
++	$(CC) -o $@ $(CPPFLAGS) $(ALL_CFLAGS) $(CFLAGS) $(INCLUDES) -c $<
 +
 +# Objectives
 +
 +all:: libs $(PROG)
 +
 +$(PROG):: $(OBJS)
-+	$(CC) -o $@ $(ALL_CFLAGS) $(CFLAGS) $^ $(LDADD)
++	$(CC) -o $@ $(LDFLAGS) $^ $(LDADD)
 +
 +ifneq (,$(findstring static,$(LIB_type)))
 +LIB_targets += lib$(LIB).a
@@ -101,7 +101,7 @@
 +	ln -fs $^ $@
 +
 +$(SHLIB_SONAME):: $(LIBSOBJS)
-+	gcc -shared -Wl,-soname -Wl,$(SHLIB_SONAME) -o $@ $^ $(LDADD)
++	gcc $(LDFLAGS) -shared -Wl,-soname -Wl,$(SHLIB_SONAME) -o $@ $^ $(LDADD)
 +
 +lib$(LIB).a:: $(LIBOBJS)
 +	ar rcs $@ $^