Commit d1cac1e5 authored by nico's avatar nico

use Build/Configure/Default macro, Makefile cleanup


git-svn-id: svn://svn.openwrt.org/openwrt/packages@5329 3c298f89-4303-0410-b956-a3cf2f4a3e73
parent f200c1bf
......@@ -12,12 +12,12 @@ PKG_NAME:=bluez-libs
PKG_VERSION:=2.24
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://bluez.sourceforge.net/download
PKG_MD5SUM:=d0ba50e251ae1e7f2c09024facde8e40
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk
......@@ -26,55 +26,22 @@ define Package/bluez-libs
SECTION:=libs
CATEGORY:=Libraries
TITLE:=Bluetooth library
DESCRIPTION:=Bluetooth library.
URL:=http://www.bluez.org/
endef
define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--program-prefix="" \
--program-suffix="" \
--prefix=/usr \
--exec-prefix=/usr \
--bindir=/usr/bin \
--datadir=/usr/share \
--includedir=/usr/include \
--infodir=/usr/share/info \
--libdir=/usr/lib \
--libexecdir=/usr/lib \
--localstatedir=/var \
--mandir=/usr/share/man \
--sbindir=/usr/sbin \
--sysconfdir=/etc \
$(DISABLE_LARGEFILE) \
$(DISABLE_NLS) \
--enable-shared \
--enable-static \
--disable-rpath \
);
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
)
endef
define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
define Package/bluez-libs/install
install -d -m0755 $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(1)/usr/lib/
endef
define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/include/bluetooth
$(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(STAGING_DIR)/usr/include/bluetooth
......@@ -88,4 +55,9 @@ define Build/UninstallDev
$(STAGING_DIR)/usr/lib/libbluetooth.{a,so*}
endef
define Package/bluez-libs/install
install -d -m0755 $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,bluez-libs))
......@@ -12,7 +12,6 @@ PKG_NAME:=curl
PKG_VERSION:=7.14.0
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
http://www.mirrorspace.org/curl/ \
......@@ -24,103 +23,67 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
PKG_MD5SUM:=46ce665e47d37fce1a0bad935cce58a9
PKG_CAT:=bzcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk
define Package/libcurl
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libopenssl +zlib
TITLE:=A client-side URL transfer utility
DESCRIPTION:=A client-side URL transfer utility.
define Package/curl/Default
SECTION:=net
CATEGORY:=Network
URL:=http://curl.haxx.se/
endef
define Package/curl
SECTION:=net
CATEGORY:=Network
$(call Package/curl/Default)
DEPENDS:=+libcurl
TITLE:=A client-side URL transfer library
DESCRIPTION:=A client-side URL transfer library.
URL:=http://curl.haxx.se/
endef
define Package/libcurl
$(call Package/curl/Default)
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libopenssl +zlib
TITLE:=A client-side URL transfer utility
endef
define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(strip $(TARGET_CFLAGS))" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--program-prefix="" \
--program-suffix="" \
--prefix=/usr \
--exec-prefix=/usr \
--bindir=/usr/bin \
--datadir=/usr/share \
--includedir=/usr/include \
--infodir=/usr/share/info \
--libdir=/usr/lib \
--libexecdir=/usr/lib \
--localstatedir=/var \
--mandir=/usr/share/man \
--sbindir=/usr/sbin \
--sysconfdir=/etc \
$(DISABLE_LARGEFILE) \
$(DISABLE_NLS) \
--enable-shared \
--enable-static \
--disable-rpath \
--with-gnu-ld \
--disable-thread \
--enable-cookies \
--enable-crypto-auth \
--enable-nonblocking \
--enable-file \
--enable-ftp \
--enable-http \
--enable-ipv6 \
--disable-ares \
--disable-debug \
--disable-dict \
--disable-gopher \
--disable-ldap \
--disable-manual \
--disable-sspi \
--disable-telnet \
--disable-verbose \
--with-random="/dev/urandom" \
--with-ssl="$(STAGING_DIR)/usr" \
--without-ca-bundle \
--without-gnutls \
--without-libidn \
--with-zlib="$(STAGING_DIR)/usr" \
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
--disable-thread \
--enable-cookies \
--enable-crypto-auth \
--enable-nonblocking \
--enable-file \
--enable-ftp \
--enable-http \
--enable-ipv6 \
--disable-ares \
--disable-debug \
--disable-dict \
--disable-gopher \
--disable-ldap \
--disable-manual \
--disable-sspi \
--disable-telnet \
--disable-verbose \
--with-random="/dev/urandom" \
--with-ssl="$(STAGING_DIR)/usr" \
--without-ca-bundle \
--without-gnutls \
--without-libidn \
--with-zlib="$(STAGING_DIR)/usr" \
);
endef
define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
define Package/libcurl/install
install -m0755 -d $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/
endef
define Package/curl/install
install -m0755 -d $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/
endef
define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(STAGING_DIR)/usr/bin/
......@@ -133,11 +96,20 @@ define Build/InstallDev
endef
define Build/UninstallDev
rm -rf \
$(STAGING_DIR)/usr/bin/curl-config \
rm -rf $(STAGING_DIR)/usr/bin/curl-config \
$(STAGING_DIR)/usr/include/curl \
$(STAGING_DIR)/usr/lib/libcurl.{a,so*}
endef
$(eval $(call BuildPackage,libcurl))
define Package/curl/install
install -d -m0755 $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/
endef
define Package/libcurl/install
install -d -m0755 $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,curl))
$(eval $(call BuildPackage,libcurl))
......@@ -12,13 +12,14 @@ PKG_NAME:=cyrus-sasl
PKG_VERSION:=2.1.20
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://ftp.andrew.cmu.edu/pub/cyrus-mail/
PKG_MD5SUM:=268ead27f4ac39bcfe17d9e38e0f2977
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
PKG_BUILDDEP:=libopenssl
include $(INCLUDE_DIR)/package.mk
......@@ -27,80 +28,53 @@ define Package/libsasl2
SECTION:=libs
CATEGORY:=Libraries
TITLE:=A general purpose authentication library
DESCRIPTION:=A general purpose authentication library.
URL:=http://asg.web.cmu.edu/sasl/
endef
define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--program-prefix="" \
--program-suffix="" \
--prefix=/usr \
--exec-prefix=/usr \
--bindir=/usr/bin \
--datadir=/usr/share \
--includedir=/usr/include \
--infodir=/usr/share/info \
--libdir=/usr/lib \
--libexecdir=/usr/lib \
--localstatedir=/var \
--mandir=/usr/share/man \
--sbindir=/usr/sbin \
--sysconfdir=/etc \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
--enable-shared \
--enable-static \
--disable-sample \
--enable-staticdlopen \
--disable-java \
--disable-alwaystrue \
--disable-checkapop \
--enable-cram \
--enable-digest \
--disable-otp \
--disable-srp \
--disable-srp-setpass \
--disable-krb4 \
--disable-gssapi \
--disable-gss_mutexes \
--enable-plain \
--enable-anon \
--disable-login \
--disable-ntlm \
--disable-sql \
--with-dblib="none" \
--without-gdbm \
--with-devrandom="/dev/urandom" \
--without-pam \
--without-saslauthd \
--without-authdaemond \
--without-pwcheck \
--with-ipctype=unix \
--with-openssl="$(STAGING_DIR)/usr" \
--without-des \
--without-opie \
--without-ldap \
--without-mysql \
--without-pgsql \
--without-sqlite \
--without-rc4 \
--without-dmalloc \
--without-sfio \
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
--disable-sample \
--enable-staticdlopen \
--disable-java \
--disable-alwaystrue \
--disable-checkapop \
--enable-cram \
--enable-digest \
--disable-otp \
--disable-srp \
--disable-srp-setpass \
--disable-krb4 \
--disable-gssapi \
--disable-gss_mutexes \
--enable-plain \
--enable-anon \
--disable-login \
--disable-ntlm \
--disable-sql \
--with-dblib="none" \
--without-gdbm \
--with-devrandom="/dev/urandom" \
--without-pam \
--without-saslauthd \
--without-authdaemond \
--without-pwcheck \
--with-ipctype=unix \
--with-openssl="$(STAGING_DIR)/usr" \
--without-des \
--without-opie \
--without-ldap \
--without-mysql \
--without-pgsql \
--without-sqlite \
--without-rc4 \
--without-dmalloc \
--without-sfio \
);
endef
define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR)/include \
CC="$(HOSTCC)" \
LINK="$(HOSTCC) -o makemd5 -lc" \
......@@ -112,13 +86,6 @@ define Build/Compile
all install
endef
define Package/libsasl2/install
install -m0755 -d $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(1)/usr/lib/
install -m0755 -d $(1)/usr/lib/sasl2
$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so.* $(1)/usr/lib/sasl2/
endef
define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/sasl $(STAGING_DIR)/usr/include/
......@@ -131,10 +98,16 @@ define Build/InstallDev
endef
define Build/UninstallDev
rm -rf \
$(STAGING_DIR)/usr/include/sasl \
rm -rf $(STAGING_DIR)/usr/include/sasl \
$(STAGING_DIR)/usr/lib/libsasl{2,}.{a,so*} \
$(STAGING_DIR)/usr/lib/sasl2
endef
define Package/libsasl2/install
install -d -m0755 $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libsasl2.so.* $(1)/usr/lib/
install -d -m0755 $(1)/usr/lib/sasl2
$(CP) $(PKG_INSTALL_DIR)/usr/lib/sasl2/lib*.so.* $(1)/usr/lib/sasl2/
endef
$(eval $(call BuildPackage,libsasl2))
......@@ -12,12 +12,12 @@ PKG_NAME:=expat
PKG_VERSION:=1.95.8
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_MD5SUM:=aff487543845a82fe262e6e2922b4c8e
PKG_SOURCE_URL:=@SF/expat
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk
......@@ -26,54 +26,24 @@ define Package/libexpat
SECTION:=libs
CATEGORY:=Libraries
TITLE:=An XML parsing library
DESCRIPTION:=A fast, non-validating, stream-oriented XML parsing library.
DESCRIPTION:=\
A fast, non-validating, stream-oriented XML parsing library.
URL:=http://expat.sourceforge.net/
endef
define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--program-prefix="" \
--program-suffix="" \
--prefix=/usr \
--exec-prefix=/usr \
--bindir=/usr/bin \
--datadir=/usr/share \
--includedir=/usr/include \
--infodir=/usr/share/info \
--libdir=/usr/lib \
--libexecdir=/usr/lib \
--localstatedir=/var \
--mandir=/usr/share/man \
--sbindir=/usr/sbin \
--sysconfdir=/etc \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
--enable-shared \
--enable-static \
);
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
)
endef
define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
define Package/libexpat/install
install -m0755 -d $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/
endef
define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/xmlwf $(STAGING_DIR)/usr/bin/
......@@ -90,4 +60,9 @@ define Build/UninstallDev
$(STAGING_DIR)/usr/lib/libexpat.{a,so*}
endef
define Package/libexpat/install
install -d -m0755 $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libexpat.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libexpat))
......@@ -12,12 +12,12 @@ PKG_NAME:=libfreetype
PKG_VERSION:=2.1.9
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/freetype-$(PKG_VERSION)
PKG_SOURCE:=freetype-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/freetype
PKG_MD5SUM:=ec1b903e4be5f073caa72458ea58c29c
PKG_CAT:=bzcat
PKG_BUILD_DIR:=$(BUILD_DIR)/freetype-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk
......@@ -27,57 +27,29 @@ define Package/libfreetype
CATEGORY:=Libraries
DEPENDS:=+zlib
TITLE:=A free, high-quality and portable font engine
DESCRIPTION:=A free, high-quality and portable font engine.\\\
The FreeType project is a team of volunteers who develop free, \\\
portable and high-quality software solutions for digital typography.\\\
They specifically target embedded systems and focus on bringing small, \\\
efficient and ubiquitous products.
DESCRIPTION:=\
The FreeType project is a team of volunteers who develop free, \\\
portable and high-quality software solutions for digital typography.\\\
They specifically target embedded systems and focus on bringing small, \\\
efficient and ubiquitous products.
URL:=http://www.freetype.org/
endef
define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
$(TARGET_CONFIGURE_OPTS) \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--program-prefix="" \
--program-suffix="" \
--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 \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
--enable-shared=yes \
--enable-static=yes \
--disable-rpath \
);
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
)
$(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib"|g' \
$(PKG_BUILD_DIR)/builds/unix/libtool
endef
define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
all install
endef
define Package/libfreetype/install
install -d -m0755 $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(1)/usr/lib/
endef
define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/freetype-config $(STAGING_DIR)/usr/bin/
......@@ -101,4 +73,9 @@ define Build/UninstallDev
$(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc
endef
define Package/libfreetype/install
install -d -m0755 $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfreetype.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,libfreetype))
......@@ -12,7 +12,6 @@ PKG_NAME:=glib
PKG_VERSION:=1.2.10
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
http://ftp.gwdg.de/pub/misc/grafik/gimp/gtk/v1.2/ \
......@@ -21,6 +20,7 @@ PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
PKG_MD5SUM:=6fe30dad87c77b91b632def29dd69ef9
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk
......@@ -30,68 +30,44 @@ define Package/glib1
CATEGORY:=Libraries
DEPENDS:=+libpthread
TITLE:=The GLib library of C routines
DESCRIPTION:=The GLib library of C routines.\\\
GLib is a library containing many useful C routines for things such \\\
as trees, hashes, and lists.
DESCRIPTION:=\
GLib is a library containing many useful C routines for things such \\\
as trees, hashes, and lists.
URL:=http://www.gtk.org/
endef
# commas are interpreted by the $(call ...) macro, so define an intermediate variable holding our settings
PKG_CONFIGURE_VARS:=\
glib_cv_prog_cc_ansi_proto=no \
glib_cv_has__inline=yes \
glib_cv_has__inline__=yes \
glib_cv_hasinline=yes \
glib_cv_sane_realloc=yes \
glib_cv_va_copy=no \
glib_cv___va_copy=yes \
glib_cv_va_val_copy=yes \
glib_cv_rtldglobal_broken=no \
glib_cv_uscore=no \
glib_cv_func_pthread_mutex_trylock_posix=yes \
glib_cv_func_pthread_cond_timedwait_posix=yes \
glib_cv_sizeof_gmutex=24 \
glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \
glib_cv_sizeof_gmutex=24 \
glib_cv_prog_cc_ansi_proto="no" \
glib_cv_has__inline="yes" \
glib_cv_has__inline__="yes" \
glib_cv_hasinline="yes" \
glib_cv_sane_realloc="yes" \
glib_cv_va_copy="no" \
glib_cv___va_copy="yes" \
glib_cv_va_val_copy="yes" \
glib_cv_rtldglobal_broken="no" \
glib_cv_uscore="no" \
glib_cv_func_pthread_mutex_trylock_posix="yes" \
glib_cv_func_pthread_cond_timedwait_posix="yes" \
glib_cv_sizeof_gmutex="24" \
glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--program-prefix="" \
--program-suffix="" \
--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 \
$(DISABLE_NLS) \
$(DISABLE_LARGEFILE) \
--enable-shared=yes \
--enable-static=yes \
);
$(call Build/Configure/Default, \
--enable-shared \
--enable-static \
, \
$(PKG_CONFIGURE_VARS) \
)
endef
define Build/Compile
rm -rf $(PKG_INSTALL_DIR)
mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
install
endef
define Package/glib1/install
install -m0755 -d $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(1)/usr/lib/
endef
define Build/InstallDev
mkdir -p $(STAGING_DIR)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/glib-config $(STAGING_DIR)/usr/bin/
......@@ -116,4 +92,9 @@ define Build/UninstallDev
$(STAGING_DIR)/usr/lib/pkgconfig/g{lib,module,thread}.pc
endef
define Package/glib1/install
install -d -m0755 $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libg{lib,module,thread}-1.2.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,glib1))
......@@ -12,7 +12,6 @@ PKG_NAME:=gnutls
PKG_VERSION:=1.0.25
PKG_RELEASE:=0
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/ \
ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/ \
......@@ -22,125 +21,81 @@ PKG_SOURCE_URL:=ftp://ftp.gnutls.org/pub/gnutls/ \
PKG_MD5SUM:=3585b5b204135e51e0efc9084b3e028b
PKG_CAT:=zcat
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
include $(INCLUDE_DIR)/package.mk
define Package/libgnutls
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libgcrypt
TITLE:=GNU TLS library
DESCRIPTION:=The GNU TLS library.\\\
GnuTLS is a project that aims to develop a library which provides a \\\
secure layer, over a reliable transport layer. Currently the GnuTLS \\\