SOURCES: rpm-macros.patch - defined %optldflags

sparky sparky at pld-linux.org
Sat Aug 5 20:55:11 CEST 2006


Author: sparky                       Date: Sat Aug  5 18:55:11 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- defined %optldflags

---- Files affected:
SOURCES:
   rpm-macros.patch (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SOURCES/rpm-macros.patch
diff -u SOURCES/rpm-macros.patch:1.28 SOURCES/rpm-macros.patch:1.29
--- SOURCES/rpm-macros.patch:1.28	Sun Jul 23 22:22:18 2006
+++ SOURCES/rpm-macros.patch	Sat Aug  5 20:55:06 2006
@@ -1,5 +1,6 @@
---- rpm-4.4.3/macros.in	2005-11-19 01:19:50.657854672 +0100
-+++ rpm-4.4.6/macros.in	2006-05-24 11:49:38.438332239 +0300
+diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
+--- rpm-4.4.6.orig/macros.in	2006-08-05 20:52:48.000000000 +0200
++++ rpm-4.4.6.macros/macros.in	2006-08-05 20:53:57.000000000 +0200
 @@ -219,7 +219,7 @@
  %_tmppath		%{_var}/tmp
  
@@ -20,7 +21,7 @@
  
  #	Archive formats to use for source/binary package payloads.
  #		"cpio"		cpio archive (default)
-@@ -932,10 +932,10 @@
+@@ -909,10 +909,10 @@
    export RPM_BUILD_ROOT}\
    %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
    export CLASSPATH}\
@@ -33,7 +34,8 @@
    \
    %{verbose:set -x}%{!verbose:exec > /dev/null}\
    umask 022\
-@@ -1374,4 +1374,17 @@
+@@ -1350,5 +1350,22 @@
+ #%__executable_provides	@RPMCONFIGDIR@/executabledeps.sh --provides
  #%__executable_requires	@RPMCONFIGDIR@/executabledeps.sh --requires
  
 +# PLD rpm macros
@@ -45,6 +47,10 @@
 +%debuginfocflags	%{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -ggdb}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
 +
 +%debugcflags	-O0 -g -Wall
++%optldflags	-Wl,--as-needed
++
++# Warning: those macros are overwritten by macros.build,
++#          left here for compatibility
 +%rpmcflags	%{?debug:%debugcflags}%{!?debug:%optflags}%{?debuginfocflags}
 +%rpmcxxflags	%{rpmcflags}
 +%rpmldflags	%{!?no_build_with_as_needed:-Wl,--as-needed}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm-macros.patch?r1=1.28&r2=1.29&f=u



More information about the pld-cvs-commit mailing list