Author: pebender
Date: Tue Nov 25 07:44:48 2008
New Revision: 3998
Added:
trunk/gar-minimyth/script/utils/bzip2/files/bzip2-1.0.5-cflags.patch
trunk/gar-minimyth/script/utils/bzip2/files/bzip2-1.0.5-so.patch
Modified:
trunk/gar-minimyth/script/utils/bzip2/Makefile
trunk/gar-minimyth/script/utils/bzip2/checksums
Log:
- Fixed bug that caused there to be no shared library for bzip2.
Modified: trunk/gar-minimyth/script/utils/bzip2/Makefile
==============================================================================
--- trunk/gar-minimyth/script/utils/bzip2/Makefile (original)
+++ trunk/gar-minimyth/script/utils/bzip2/Makefile Tue Nov 25 07:44:48 2008
@@ -3,7 +3,7 @@
CATEGORIES = utils
MASTER_SITES = http://www.bzip.org/$(GARVERSION)/
DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES = $(DISTNAME)-perl.patch.gar $(DISTNAME).patch
+PATCHFILES = $(DISTNAME)-so.patch $(DISTNAME)-cflags.patch
$(DISTNAME)-perl.patch.gar $(DISTNAME).patch
LICENSE = bzip2
bzip2_LICENSE_TEXT = $(WORKSRC)/LICENSE
@@ -13,8 +13,8 @@
DEPENDS = lang/c
-BUILD_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = $(WORKSRC)/Makefile
+BUILD_SCRIPTS = custom
+INSTALL_SCRIPTS = $(WORKSRC)/Makefile shared
BUILD_ARGS = \
CC="$(CC)" \
@@ -27,8 +27,7 @@
bindir="$(bindir)" \
libdir="$(libdir)" \
includedir="$(includedir)" \
- mandir="$(mandir)" \
- libbz2.a bzip2 bzip2recover
+ mandir="$(mandir)"
INSTALL_ARGS = \
CC="$(CC)" \
AR="$(AR)" \
@@ -45,6 +44,22 @@
include ../../gar.mk
CFLAGS += -fpic -fPIC -Wall -Winline -D_FILE_OFFSET_BITS=64
+
+build-custom:
+ $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach
TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") \
+ -C $(WORKSRC) -f Makefile $(BUILD_ARGS) libbz2.a
bzip2
bzip2recover
+ $(BUILD_ENV) $(MAKE) $(PARALLELMFLAGS) $(foreach
TTT,$(BUILD_OVERRIDE_DIRS),$(TTT)="$($(TTT))") \
+ -C $(WORKSRC) -f Makefile-libbz2_so $(BUILD_ARGS) all
+ @$(MAKECOOKIE)
+
+install-shared:
+ @rm -f $(DESTDIR)$(libdir)/libbz2.so $(DESTDIR)$(libdir)/libbz2.so.*
+ @cp -f $(WORKSRC)/libbz2.so.$(GARVERSION)
$(DESTDIR)$(libdir)/libbz2.so.$(GARVERSION)
+ @chmod 0644 $(DESTDIR)$(libdir)/libbz2.so.$(GARVERSION)
+ @ln -sf libbz2.so.$(GARVERSION) $(DESTDIR)$(libdir)/libbz2.so.1.0
+ @ln -sf libbz2.so.1.0 $(DESTDIR)$(libdir)/libbz2.so.1
+ @ln -sf libbz2.so.1 $(DESTDIR)$(libdir)/libbz2.so
+ @$(MAKECOOKIE)
post-install:
@rm -f $(DESTDIR)$(libdir)/libbz2.a
Modified: trunk/gar-minimyth/script/utils/bzip2/checksums
==============================================================================
--- trunk/gar-minimyth/script/utils/bzip2/checksums (original)
+++ trunk/gar-minimyth/script/utils/bzip2/checksums Tue Nov 25 07:44:48 2008
@@ -1,3 +1,5 @@
3c15a0c8d1d3ee1c46a1634d00617b1a download/bzip2-1.0.5.tar.gz
+a289117d9d7ab98f3a2c1650a0a39c90 download/bzip2-1.0.5-so.patch
+3b6c132573735973a1ff5921735236fe download/bzip2-1.0.5-cflags.patch
51982c3e6b01194c84bdffc0585ec2d2 download/bzip2-1.0.5-perl.patch.gar
a932f8d07d8014480a52e84e94852517 download/bzip2-1.0.5.patch
Added: trunk/gar-minimyth/script/utils/bzip2/files/bzip2-1.0.5-cflags.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/utils/bzip2/files/bzip2-1.0.5-cflags.patch
Tue Nov 25 07:44:48 2008
@@ -0,0 +1,12 @@
+diff -Naur bzip2-1.0.5-old/Makefile-libbz2_so
bzip2-1.0.5-new/Makefile-libbz2_so
+--- bzip2-1.0.5-old/Makefile-libbz2_so 2008-11-23 21:49:44.000000000 -0800
++++ bzip2-1.0.5-new/Makefile-libbz2_so 2008-11-23 21:52:26.000000000 -0800
+@@ -35,7 +35,7 @@
+ bzlib.o
+
+ all: $(OBJS)
+- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.5 $(OBJS)
++ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.5
$(OBJS)
+ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.5
+ rm -f libbz2.so.1.0 libbz2.so.1
+ ln -s libbz2.so.1.0.5 libbz2.so.1.0
Added: trunk/gar-minimyth/script/utils/bzip2/files/bzip2-1.0.5-so.patch
==============================================================================
--- (empty file)
+++ trunk/gar-minimyth/script/utils/bzip2/files/bzip2-1.0.5-so.patch Tue
Nov 25 07:44:48 2008
@@ -0,0 +1,31 @@
+diff -Naur bzip2-1.0.5-old/Makefile-libbz2_so
bzip2-1.0.5-new/Makefile-libbz2_so
+--- bzip2-1.0.5-old/Makefile-libbz2_so 2007-12-09 05:00:50.000000000 -0800
++++ bzip2-1.0.5-new/Makefile-libbz2_so 2008-11-23 21:49:44.000000000 -0800
+@@ -1,6 +1,6 @@
+
+ # This Makefile builds a shared version of the library,
+-# libbz2.so.1.0.4, with soname libbz2.so.1.0,
++# libbz2.so.1.0.5, with soname libbz2.so.1,
+ # at least on x86-Linux (RedHat 7.2),
+ # with gcc-2.96 20000731 (Red Hat Linux 7.1 2.96-98).
+ # Please see the README file for some important info
+@@ -35,13 +35,14 @@
+ bzlib.o
+
+ all: $(OBJS)
+- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.4 $(OBJS)
+- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.4
+- rm -f libbz2.so.1.0
+- ln -s libbz2.so.1.0.4 libbz2.so.1.0
++ $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.5 $(OBJS)
++ $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.5
++ rm -f libbz2.so.1.0 libbz2.so.1
++ ln -s libbz2.so.1.0.5 libbz2.so.1.0
++ ln -s libbz2.so.1.0 libbz2.so.1
+
+ clean:
+- rm -f $(OBJS) bzip2.o libbz2.so.1.0.4 libbz2.so.1.0 bzip2-shared
++ rm -f $(OBJS) bzip2.o libbz2.so.1.0.5 libbz2.so.1.0 libbz2.so.1
bzip2-shared
+
+ blocksort.o: blocksort.c
+ $(CC) $(CFLAGS) -c blocksort.c
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
