bzip2: Fix soname and building with CFLAGS.

diff --git a/bzip2/bzip2.nm b/bzip2/bzip2.nm
index 41ef384111b0ab04eaa46755ef1eedee52a930a4..97e1972e855864c56c7672eefa2726b2afd062d8 100644 (file)
--- a/bzip2/bzip2.nm
+++ b/bzip2/bzip2.nm
@@ -5,7 +5,7 @@
 
 name       = bzip2
 version    = 1.0.6
-release    = 2
+release    = 3
 
 groups     = Applications/Compression
 url        = http://www.bzip.org/
@@ -29,10 +29,12 @@ build
 
        build
                %{DO_FIX_LIBTOOL}
-               make -f Makefile-libbz2_so %{PARALLELISMFLAGS}
+               make -f Makefile-libbz2_so %{PARALLELISMFLAGS} \
+                       CFLAGS="%{CFLAGS}"
 
                make clean
-               make %{PARALLELISMFLAGS}
+               make %{PARALLELISMFLAGS} \
+                       CFLAGS="%{CFLAGS}"
        end
 
        install
@@ -56,7 +58,7 @@ packages
        package %{name}
                groups += Build
        end
-       
+
        package %{name}-devel
                template DEVEL
        end

diff --git a/bzip2/patches/bzip2-1.0.4-saneso.patch b/bzip2/patches/bzip2-1.0.4-saneso.patch
new file mode 100644 (file)
index 0000000..6b3430c
--- /dev/null
+++ b/bzip2/patches/bzip2-1.0.4-saneso.patch
@@ -0,0 +1,12 @@
+diff -up bzip2-1.0.6/Makefile-libbz2_so.pom bzip2-1.0.6/Makefile-libbz2_so
+--- bzip2-1.0.6/Makefile-libbz2_so.pom 2010-09-11 01:07:52.000000000 +0200
++++ bzip2-1.0.6/Makefile-libbz2_so     2010-09-22 10:31:46.000000000 +0200
+@@ -35,7 +35,7 @@ OBJS= blocksort.o  \
+       bzlib.o
+ 
+ all: $(OBJS)
+-      $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS)
++      $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.6 $(OBJS)
+       $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6
+       rm -f libbz2.so.1.0
+       ln -s libbz2.so.1.0.6 libbz2.so.1.0