- pass CFLAGS (fixed Makefile)

Changed files:
    env-update-cflags.patch -> 1.1
    env-update.spec -> 1.2

diff --git a/env-update-cflags.patch b/env-update-cflags.patch
new file mode 100644 (file)
index 0000000..c79a7be
--- /dev/null
+++ b/env-update-cflags.patch
@@ -0,0 +1,11 @@
+--- rc-scripts-1.6.14/src/filefuncs/Makefile~  2003-04-06 18:28:27.000000000 +0200
++++ rc-scripts-1.6.14/src/filefuncs/Makefile   2006-03-25 17:55:00.000000000 +0100
+@@ -6,7 +6,7 @@
+ all: $(TARGETS)
+ 
+ filefuncs.o: filefuncs.c
+-      $(CC) -shared -Wall -DHAVE_CONFIG_H -c -O -fPIC -I/usr/include/awk $^
++      $(CC) -shared -Wall -DHAVE_CONFIG_H -c $(CFLAGS) -fPIC -I/usr/include/awk $^
+ 
+ filefuncs.so: filefuncs.o
+       $(LD) -o $@ -shared $^

diff --git a/env-update.spec b/env-update.spec
index 6f69fbecb1fb7b3190accb66458729b31a6482c3..6b6dbd1cb250ad8a9b39c0849812082d4bfd5f32 100644 (file)
--- a/env-update.spec
+++ b/env-update.spec
@@ -7,6 +7,7 @@ Group:          Base
 Source0:       http://distfiles.gentoo.org/distfiles/rc-scripts-%{version}.tar.bz2
 # Source0-md5: 3ef9ae479847d474c33d7d54f4912e77
 Patch0:                %{name}.patch
+Patch1:                %{name}-cflags.patch
 BuildRequires: gawk-devel
 Requires:      gawk
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -21,11 +22,13 @@ loads.
 %prep
 %setup -q -n rc-scripts-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} -C src/filefuncs \
        CC="%{__cc}" \
-       LD="%{__ld}"
+       CFLAGS="%{rpmcflags}" \
+       LD="%{__ld}" 
 
 %install
 rm -rf $RPM_BUILD_ROOT