Commit c3da0d82 authored by Eric Andersen's avatar Eric Andersen
Browse files

Update a few packages

parent e2578ec3

package/berkeleydb/berkeleydb.mk

+9 −9
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
DB_SITE:=ftp://sleepycat1.inetu.net/releases/

DB_SOURCE:=db-4.2.52.NC.tar.gz

DB_DIR:=$(BUILD_DIR)/db-4.2.52.NC



DB_SHARLIB:=libdb-4.2.so



$(DL_DIR)/$(DB_SOURCE):

	$(WGET) -P $(DL_DIR) $(DB_SITE)/$(DB_SOURCE)
@@ -46,10 +46,10 @@ $(DB_DIR)/.configured: $(DB_DIR)/.dist 
	$(SED) 's/\.lo/.o/g' $(DB_DIR)/build_unix/Makefile

	touch  $(DB_DIR)/.configured



$(DB_DIR)/build_unix/.libs/libdb-4.1.so: $(DB_DIR)/.configured

$(DB_DIR)/build_unix/.libs/$(DB_SHARLIB): $(DB_DIR)/.configured

	$(MAKE) CC=$(TARGET_CC) -C $(DB_DIR)/build_unix



$(STAGING_DIR)/lib/libdb-4.1.so: $(DB_DIR)/build_unix/.libs/libdb-4.1.so

$(STAGING_DIR)/lib/$(DB_SHARLIB): $(DB_DIR)/build_unix/.libs/$(DB_SHARLIB)

	$(MAKE) \

	    prefix=$(STAGING_DIR) \

	    exec_prefix=$(STAGING_DIR) \
@@ -69,11 +69,11 @@ $(STAGING_DIR)/lib/libdb-4.1.so: $(DB_DIR)/build_unix/.libs/libdb-4.1.so 
	rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/info \

		$(STAGING_DIR)/man $(STAGING_DIR)/share/doc



$(TARGET_DIR)/lib/libdb-4.1.so: $(STAGING_DIR)/lib/libdb-4.1.so

$(TARGET_DIR)/lib/$(DB_SHARLIB): $(STAGING_DIR)/lib/$(DB_SHARLIB)

	rm -rf $(TARGET_DIR)/lib/libdb*

	cp -a $(STAGING_DIR)/lib/libdb*so*  $(TARGET_DIR)/lib/

	rm -f $(TARGET_DIR)/lib/libdb.so $(TARGET_DIR)/lib/libdb.la $(TARGET_DIR)/lib/libdb.a

	(cd $(TARGET_DIR)/usr/lib; ln -fs /lib/libdb-4.1.so libdb.so)

	(cd $(TARGET_DIR)/usr/lib; ln -fs /lib/$(DB_SHARLIB) libdb.so)

	-$(STRIP) --strip-unneeded $(TARGET_DIR)/lib/libdb*so*



$(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-4.1.a
@@ -90,5 +90,5 @@ berkeleydb-clean: 
berkeleydb-dirclean:

	rm -rf $(DB_DIR)



berkeleydb: uclibc $(TARGET_DIR)/lib/libdb-4.1.so

berkeleydb: uclibc $(TARGET_DIR)/lib/$(DB_SHARLIB)

package/boa/boa.mk

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ $(BOA_WORKDIR)/boa $(BOA_WORKDIR)/boa_indexer: $(BOA_WORKDIR)/Makefile 
	rm -f $@

	$(MAKE) -C $(BOA_WORKDIR)



$(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/boa $(BOA_WORKDIR)/boa_indexer

$(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer

	mkdir -p $(TARGET_DIR)/usr/sbin

	cp -f $(BOA_WORKDIR)/src/boa $(TARGET_DIR)/usr/sbin/boa

	mkdir -p $(TARGET_DIR)/usr/lib/boa

package/dhcp_relay/dhcp_relay.mk

+2 −2
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
# dhcp_relay

#

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

DHCP_RELAY_SOURCE:=dhcp-3.0pl2.tar.gz

DHCP_RELAY_SOURCE:=dhcp-3.0.1.tar.gz

DHCP_RELAY_SITE:=ftp://ftp.isc.org/isc/dhcp

DHCP_RELAY_CAT:=zcat

DHCP_RELAY_DIR:=$(BUILD_DIR)/dhcp-3.0pl2

DHCP_RELAY_DIR:=$(BUILD_DIR)/dhcp-3.0.1

DHCP_RELAY_BINARY:=work.linux-2.2/relay/dhcrelay

DHCP_RELAY_TARGET_BINARY:=usr/sbin/dhcrelay

BVARS=PREDEFINES='-D_PATH_DHCPD_DB=\"/var/lib/dhcp/dhcpd.leases\" \

package/fakeroot/fakeroot.mk

+3 −3
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@ 
# fakeroot

#

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

FAKEROOT_SOURCE:=fakeroot_0.7.5.tar.gz

FAKEROOT_SOURCE:=fakeroot_1.1.2.tar.gz

FAKEROOT_SITE:=http://ftp.debian.org/debian/pool/main/f/fakeroot

FAKEROOT_CAT:=zcat

FAKEROOT_DIR:=$(BUILD_DIR)/fakeroot-0.7.5

FAKEROOT_DIR:=$(BUILD_DIR)/fakeroot-1.1.2





$(DL_DIR)/$(FAKEROOT_SOURCE):
@@ -18,7 +18,7 @@ $(FAKEROOT_DIR)/.unpacked: $(DL_DIR)/$(FAKEROOT_SOURCE) 
	$(FAKEROOT_CAT) $(DL_DIR)/$(FAKEROOT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	# If using busybox getopt, make it be quiet.

	$(SED) "s,getopt --version,getopt --version 2>/dev/null," \

		$(FAKEROOT_DIR)/scripts/fakeroot

		$(FAKEROOT_DIR)/scripts/fakeroot.in

	touch $(FAKEROOT_DIR)/.unpacked



$(FAKEROOT_DIR)/.configured: $(FAKEROOT_DIR)/.unpacked

package/jpeg/jpeg.mk

+5 −4
Original line number Diff line number Diff line
@@ -58,16 +58,17 @@ $(JPEG_DIR)/.configured: $(JPEG_DIR)/.unpacked 
	);

	touch  $(JPEG_DIR)/.configured



$(STAGING_DIR)/lib/libjpeg.so.62.0.0: $(JPEG_DIR)/.configured

$(JPEG_DIR)/.libs/libjpeg.so.62.0.0: $(JPEG_DIR)/.configured

	$(MAKE) -C $(JPEG_DIR) all

	# Note: This does not install the utilities.



$(STAGING_DIR)/lib/libjpeg.so.62.0.0: $(JPEG_DIR)/.libs/libjpeg.so.62.0.0

	$(MAKE) -C $(JPEG_DIR) prefix=$(STAGING_DIR) exec_prefix=$(STAGING_DIR) install-headers install-lib



$(TARGET_DIR)/lib/libjpeg.so.62.0.0: $(STAGING_DIR)/lib/libjpeg.so.62.0.0

$(TARGET_DIR)/usr/lib/libjpeg.so.62.0.0: $(STAGING_DIR)/lib/libjpeg.so.62.0.0

	cp -dpf $(STAGING_DIR)/lib/libjpeg.so* $(TARGET_DIR)/usr/lib/

	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libjpeg.so.62.0.0



jpeg: uclibc $(TARGET_DIR)/lib/libjpeg.so.62.0.0

jpeg: uclibc $(TARGET_DIR)/usr/lib/libjpeg.so.62.0.0



jpeg-clean:

	-$(MAKE) -C $(JPEG_DIR) clean