Author: glen Date: Mon Aug 9 13:26:46 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- take cflags and ldflags as well
---- Files affected:
packages/dss:
dss.spec (1.18 -> 1.19) , optflags.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/dss/dss.spec
diff -u packages/dss/dss.spec:1.18 packages/dss/dss.spec:1.19
--- packages/dss/dss.spec:1.18 Mon Aug 9 15:18:50 2010
+++ packages/dss/dss.spec Mon Aug 9 15:26:40 2010
@@ -142,10 +142,12 @@
EOF
%build
-export RPM_OPT_FLAGS="%{rpmcflags}"
export ARCH="%{_target_cpu}"
export CC="%{__cc}"
+export CFLAGS="%{rpmcflags}"
export CXX="%{__cxx}"
+export CXXFLAGS="%{rpmcxxflags}"
+export LDFLAGS="%{rpmldflags}"
jobs=$(echo %{_smp_mflags} | cut -dj -f2)
./Buildit ${jobs:+--jobs=$jobs}
@@ -341,6 +343,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.19 2010/08/09 13:26:40 glen
+- take cflags and ldflags as well
+
Revision 1.18 2010/08/09 13:18:50 glen
- fix installing ghost logs
================================================================
Index: packages/dss/optflags.patch
diff -u packages/dss/optflags.patch:1.1 packages/dss/optflags.patch:1.2
--- packages/dss/optflags.patch:1.1 Sun Aug 1 15:01:47 2010
+++ packages/dss/optflags.patch Mon Aug 9 15:26:40 2010
@@ -1,6 +1,6 @@
---- DarwinStreamingSrvr6.0.3-Source/Buildit~ 2010-08-01 15:43:58.000000000
+0300
-+++ DarwinStreamingSrvr6.0.3-Source/Buildit 2010-08-01 15:52:52.789829857
+0300
-@@ -66,10 +66,10 @@
+--- DarwinStreamingSrvr6.0.3-Source/Buildit 2010-08-01 15:52:52.789829857
+0300
++++ DarwinStreamingSrvr6.0.3-Source/Buildit 2010-08-09 16:23:35.167262333
+0300
+@@ -66,15 +66,15 @@
Linux.ppc)
echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
@@ -13,9 +13,17 @@
+ LINKER=${CC:-gcc}
+ MAKE=${MAKE:-make}
- COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linuxppc__ -pipe"
- INCLUDE_FLAG="-include"
-@@ -90,10 +90,10 @@
+- COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linuxppc__ -pipe"
+- INCLUDE_FLAG="-include"
++ COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linuxppc__ -pipe
$CFLAGS"
++ INCLUDE_FLAG="-include"
+
+- CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt"
++ CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt $LDFLAGS"
+
+ SHARED=-shared
+ MODULE_LIBS=
+@@ -90,15 +90,15 @@
Linux.i586 | \
Linux.i686)
echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
@@ -28,9 +36,16 @@
+ LINKER=${CC:-gcc}
+ MAKE=${MAKE:-make}
- COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe"
+- COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe"
++ COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe
$CFLAGS"
INCLUDE_FLAG="-include"
-@@ -111,10 +111,10 @@
+
+- CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt"
++ CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt $LDFLAGS"
+
+ SHARED=-shared
+ MODULE_LIBS=
+@@ -111,15 +111,15 @@
Linux.x86_64)
echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
@@ -43,9 +58,16 @@
+ LINKER=${CC:-gcc}
+ MAKE=${MAKE:-make}
- COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe
-fPIC"
+- COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe
-fPIC"
++ COMPILER_FLAGS="-D_REENTRANT -D__USE_POSIX -D__linux__ -pipe
-fPIC $CFLAGS"
INCLUDE_FLAG="-include"
-@@ -132,10 +132,10 @@
+
+- CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt"
++ CORE_LINK_LIBS="-lpthread -ldl -lstdc++ -lm -lcrypt $LDFLAGS"
+
+ SHARED=-shared
+ MODULE_LIBS=
+@@ -132,15 +132,15 @@
Linux.mips)
echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
@@ -58,9 +80,16 @@
+ LINKER=${CC:-egcs}
+ MAKE=${MAKE:-make}
- COMPILER_FLAGS="-D_REENTRANT -D__linux__ -Wno-multichar -pipe"
+- COMPILER_FLAGS="-D_REENTRANT -D__linux__ -Wno-multichar -pipe"
++ COMPILER_FLAGS="-D_REENTRANT -D__linux__ -Wno-multichar -pipe
$CFLAGS"
INCLUDE_FLAG="-include"
-@@ -153,10 +153,10 @@
+
+- CORE_LINK_LIBS="-lpthread -ldl -lm -lcrypt"
++ CORE_LINK_LIBS="-lpthread -ldl -lm -lcrypt $LDFLAGS"
+
+ SHARED=-shared
+ MODULE_LIBS=
+@@ -153,15 +153,15 @@
FreeBSD.i386)
echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
@@ -73,9 +102,16 @@
+ LINKER=${CC:-gcc}
+ MAKE=${MAKE:-make}
- COMPILER_FLAGS=
+- COMPILER_FLAGS=
++ COMPILER_FLAGS=$CFLAGS
INCLUDE_FLAG="-include"
-@@ -171,10 +171,10 @@
+
+- CORE_LINK_LIBS="-pthread -lm -lcrypt"
++ CORE_LINK_LIBS="-pthread -lm -lcrypt $LDFLAGS"
+
+ SHARED=-shared
+ MODULE_LIBS="-lgcc -lstdc++"
+@@ -171,15 +171,15 @@
# SunOS.sun4u)
SunOS.*)
echo "Configuring for the "$OSNAME" "$HARDWARENAME" platform"
@@ -88,5 +124,12 @@
+ LINKER=${CC:-g++}
+ MAKE=${MAKE:-make}
- COMPILER_FLAGS="-D__solaris__ -D_REENTRANT -DFD_SETSIZE=65536
-L/usr/local/lib -R/usr/local/lib"
+- COMPILER_FLAGS="-D__solaris__ -D_REENTRANT -DFD_SETSIZE=65536
-L/usr/local/lib -R/usr/local/lib"
++ COMPILER_FLAGS="-D__solaris__ -D_REENTRANT -DFD_SETSIZE=65536
-L/usr/local/lib -R/usr/local/lib $CFLAGS"
INCLUDE_FLAG="-include"
+
+- CORE_LINK_LIBS="-lpthread -ldl -lsocket -lnsl -lresolv -lm
-lcrypt -lstdc++"
++ CORE_LINK_LIBS="-lpthread -ldl -lsocket -lnsl -lresolv -lm
-lcrypt -lstdc++ $LDFLAGS"
+
+ SHARED=-G
+ MODULE_LIBS=
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dss/dss.spec?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dss/optflags.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
