Commit 2a2403af authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

bzip2: fixup build after ea448fef (convert to gentargets, add host package, bump version) 



Fix a few typos/mistakes introduced in commit ea448fef:

- bzip2 soname is not the same as package version
- It is PKG_INSTALL_STAGING, not PKG_STAGING_INSTALL
- Typo: BZIP2_INSTALL_TARGET_CMDS, not B2IP_INSTALL_TARGET_CMDS

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 0d1830b0

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
	New packages: librsync, libatomic_ops, libusb-compat, lmbench,

	netperf, squid



	Updated/fixed packages: alsa-utils, busybox, directfb, dnsmasq,

	Updated/fixed packages: alsa-utils, busybox, bzip2, directfb, dnsmasq,

	dosfstools, e2fsprogs, eeprog, fbv, freetype, haserl, hostapd,

	iperf, iptables, iw, less, libaio, libdrm, libgcrypt, libglib2,

	libpng, libxml2, libxslt, linux-fusion, lua, matchbox, mdadm,

package/bzip2/bzip2.mk

+12 −11
Original line number Diff line number Diff line
@@ -4,13 +4,14 @@ 
#

#############################################################

BZIP2_VERSION:=1.0.5

BZIP2_SONAME=1.0.4

BZIP2_SOURCE:=bzip2-$(BZIP2_VERSION).tar.gz

BZIP2_SITE:=http://www.bzip.org/$(BZIP2_VERSION)

BZIP2_STAGING_INSTALL=YES

BZIP2_INSTALL_STAGING=YES



define BZIP2_FIX_MAKEFILE

	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile

	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \

	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_SONAME) \

	    libbz2.so,g" $(@D)/Makefile-libbz2_so

	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile

	$(SED) "s:-O2:$(TARGET_CFLAGS):" $(@D)/Makefile-libbz2_so
@@ -39,22 +40,22 @@ endef 


define BZIP2_INSTALL_STAGING_CMDS

	cp $(@D)/bzlib.h $(STAGING_DIR)/usr/include/

	cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(STAGING_DIR)/usr/lib/

	cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(STAGING_DIR)/usr/lib/

	cp $(@D)/libbz2.a $(STAGING_DIR)/usr/lib/

	(cd $(STAGING_DIR)/usr/lib/; \

		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \

		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \

		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1; \

		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so; \

		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1.0; \

		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1; \

	)

endef



define B2IP_INSTALL_TARGET_CMDS

define BZIP2_INSTALL_TARGET_CMDS

	$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \

	$(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install

	cp $(@D)/libbz2.so.$(BZIP2_VERSION) $(TARGET_DIR)/usr/lib/

	cp $(@D)/libbz2.so.$(BZIP2_SONAME) $(TARGET_DIR)/usr/lib/

	(cd $(TARGET_DIR)/usr/lib; \

		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so.1.0; \

		ln -snf libbz2.so.$(BZIP2_VERSION) libbz2.so; \

		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so.1.0; \

		ln -snf libbz2.so.$(BZIP2_SONAME) libbz2.so; \

	)

	(cd $(TARGET_DIR)/usr/bin; \

		ln -snf bzip2 bunzip2; \
@@ -78,7 +79,7 @@ endef 


define HOST_BZIP2_FIX_MAKEFILE

	$(SED) "s,ln \$$(,ln -snf \$$(,g" $(@D)/Makefile

	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_VERSION) \

	$(SED) "s,ln -s (lib.*),ln -snf \$$1; ln -snf libbz2.so.$(BZIP2_SONAME) \

	    libbz2.so,g" $(@D)/Makefile-libbz2_so

	$(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile

	$(SED) "s:-O2:$(HOST_CFLAGS):" $(@D)/Makefile-libbz2_so