Update a few packages

This commit is contained in:
Eric Andersen 2004-10-14 09:39:25 +00:00
parent e2578ec3c5
commit c3da0d8281
19 changed files with 68 additions and 51 deletions

View file

@ -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
@ -84,11 +84,11 @@ $(TARGET_DIR)/usr/lib/libdb.a: $(STAGING_DIR)/lib/libdb-4.1.a
berkeleydb-headers: $(TARGET_DIR)/usr/lib/libdb.a
berkeleydb-clean:
berkeleydb-clean:
$(MAKE) -C $(DB_DIR)/build_unix clean
berkeleydb-dirclean:
rm -rf $(DB_DIR)
berkeleydb-dirclean:
rm -rf $(DB_DIR)
berkeleydb: uclibc $(TARGET_DIR)/lib/libdb-4.1.so
berkeleydb: uclibc $(TARGET_DIR)/lib/$(DB_SHARLIB)

View file

@ -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

View file

@ -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\" \

View file

@ -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

View file

@ -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

View file

@ -1,8 +1,6 @@
#
config BR2_PACKAGE_LIBFLOAT
bool"libfloat"
bool
default n
help
Add help text here.

View file

@ -1,3 +1,3 @@
ifeq ($(strip $(BR2_PACKAGE_LIBFLOAT)),y)
TARGETS+=libfloat
endif
#ifeq ($(strip $(BR2_PACKAGE_LIBFLOAT)),y)
#TARGETS+=libfloat
#endif

View file

@ -8,7 +8,6 @@ LIBGLIB12_SITE:=ftp://ftp.gtk.org/pub/gtk/v1.2
LIBGLIB12_CAT:=zcat
LIBGLIB12_DIR:=$(BUILD_DIR)/glib-1.2.10
LIBGLIB12_BINARY:=libglib.a
LIBGLIB12_PATCH:=libglib_configure_1.2.10.bz2
$(DL_DIR)/$(LIBGLIB12_SOURCE):
@ -18,7 +17,7 @@ libglib12-source: $(DL_DIR)/$(LIBGLIB12_SOURCE)
$(LIBGLIB12_DIR)/.unpacked: $(DL_DIR)/$(LIBGLIB12_SOURCE)
$(LIBGLIB12_CAT) $(DL_DIR)/$(LIBGLIB12_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ $(LIBGLIB12_PATCH)
toolchain/patch-kernel.sh $(LIBGLIB12_DIR) package/libglib12/ *-patch*
touch $(LIBGLIB12_DIR)/.unpacked
$(LIBGLIB12_DIR)/.configured: $(LIBGLIB12_DIR)/.unpacked

View file

@ -0,0 +1,25 @@
--- glib-1.2.10/glib.orig.h 2004-10-14 01:11:45.000000000 -0600
+++ glib-1.2.10/glib.h 2004-10-14 01:12:02.000000000 -0600
@@ -271,14 +271,15 @@
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
* macros, so we can refer to them as strings unconditionally.
+ * usage not-recommended since gcc-3.0
*/
-#ifdef __GNUC__
-#define G_GNUC_FUNCTION __FUNCTION__
-#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
-#else /* !__GNUC__ */
-#define G_GNUC_FUNCTION ""
-#define G_GNUC_PRETTY_FUNCTION ""
-#endif /* !__GNUC__ */
+#if defined (__GNUC__) && (__GNUC__ < 3)
+#define G_GNUC_FUNCTION __FUNCTION__
+#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
+#else /* !__GNUC__ */
+#define G_GNUC_FUNCTION ""
+#define G_GNUC_PRETTY_FUNCTION ""
+#endif /* !__GNUC__ */
/* we try to provide a usefull equivalent for ATEXIT if it is
* not defined, but use is actually abandoned. people should

View file

@ -34,16 +34,9 @@ $(LZO_DIR)/.configured: $(LZO_DIR)/.unpacked
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
--prefix=/ \
--includedir=/include \
--libdir=/lib \
$(LZO_CONFIG_SHARED) \
);
touch $(LZO_DIR)/.configured

View file

@ -1,8 +1,6 @@
#
config BR2_PACKAGE_MICROWIN
bool"microwin"
bool
default n
help
Add help text here.

View file

@ -1,3 +1,3 @@
ifeq ($(strip $(BR2_PACKAGE_MICROWIN)),y)
TARGETS+=microwin
endif
#ifeq ($(strip $(BR2_PACKAGE_MICROWIN)),y)
#TARGETS+=microwin
#endif

View file

@ -20,7 +20,7 @@ $(DL_DIR)/$(MROUTED_PATCH):
mrouted-source: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH)
$(MROUTED_DIR)/.unpacked: mrouted-source
$(MROUTED_DIR)/.unpacked: $(DL_DIR)/$(MROUTED_SOURCE) $(DL_DIR)/$(MROUTED_PATCH)
$(MROUTED_CAT) $(DL_DIR)/$(MROUTED_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
$(MROUTED_CAT) $(DL_DIR)/$(MROUTED_PATCH) | patch -p1 -d $(MROUTED_DIR)
toolchain/patch-kernel.sh $(MROUTED_DIR) package/mrouted/ mrouted-\*.patch

View file

@ -5,7 +5,7 @@
#############################################################
NANO_VER:=1.3.4
NANO_SOURCE:=nano-$(NANO_VER).tar.gz
NANO_SITE:=http://www.nano-editor.org/dist/v1.3/$(NANO_SOURCE)
NANO_SITE:=http://www.nano-editor.org/dist/v1.3/
NANO_DIR:=$(BUILD_DIR)/nano-$(NANO_VER)
NANO_CAT:=zcat
NANO_BINARY:=src/nano

View file

@ -3,6 +3,7 @@
config BR2_PACKAGE_NETSNMP
bool"netsnmp"
default n
select BR2_PACKAGE_OPENSSL
help
Add help text here.

View file

@ -5,9 +5,9 @@
#############################################################
NETSNMP_URL:=http://aleron.dl.sourceforge.net/sourceforge/net-snmp/
NETSNMP_DIR:=$(BUILD_DIR)/net-snmp-5.1
NETSNMP_SOURCE:=net-snmp-5.1.tar.gz
NETSNMP_PATCH1:=net-snmp_5.1-5.diff.gz
NETSNMP_DIR:=$(BUILD_DIR)/net-snmp-5.1.2
NETSNMP_SOURCE:=net-snmp-5.1.2.tar.gz
NETSNMP_PATCH1:=net-snmp_5.1.2-6.diff.gz
NETSNMP_PATCH1_URL:=http://ftp.debian.org/debian/pool/main/n/net-snmp/
$(DL_DIR)/$(NETSNMP_SOURCE):
@ -88,7 +88,7 @@ $(TARGET_DIR)/usr/sbin/snmpd: $(NETSNMP_DIR)/agent/snmpd
cp $(NETSNMP_DIR)/agent/mibgroup/mibincl.h $(STAGING_DIR)/include/net-snmp/library
cp $(NETSNMP_DIR)/agent/mibgroup/header_complex.h $(STAGING_DIR)/include/net-snmp/agent
netsnmp: $(TARGET_DIR)/usr/sbin/snmpd
netsnmp: openssl $(TARGET_DIR)/usr/sbin/snmpd
netsnmp-headers: $(TARGET_DIR)/usr/include/net-snmp/net-snmp-config.h
cp -a $(STAGING_DIR)/include/net-snmp $(TARGET_DIR)/usr/include/net-snmp

View file

@ -3,6 +3,8 @@
config BR2_PACKAGE_OPENVPN
bool"openvpn"
default n
help
select BR2_PACKAGE_LZO
select BR2_PACKAGE_OPENSSL
help
Add help text here.

View file

@ -5,7 +5,7 @@
#############################################################
RSYNC_VER:=2.6.3
RSYNC_SOURCE:=rsync-$(RSYNC_VER).tar.gz
RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/$(RSYNC_SOURCE)
RSYNC_SITE:=http://rsync.samba.org/ftp/rsync/
RSYNC_DIR:=$(BUILD_DIR)/rsync-$(RSYNC_VER)
RSYNC_CAT:=zcat
RSYNC_BINARY:=rsync