From 611c4bd671035f7ad0f71a1969b63fdcd2cb507f Mon Sep 17 00:00:00 2001 From: nico Date: Wed, 18 May 2005 11:44:00 +0000 Subject: Convert libgd to new packaging style git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@925 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/libgd/Makefile | 125 +++++++++++++++++++++------------------ package/libgd/ipkg/libgd.control | 7 +++ package/libgd/libgd.control | 7 --- 3 files changed, 75 insertions(+), 64 deletions(-) create mode 100644 package/libgd/ipkg/libgd.control delete mode 100644 package/libgd/libgd.control diff --git a/package/libgd/Makefile b/package/libgd/Makefile index e391d030a1..eaa45fcd8a 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -2,78 +2,89 @@ include $(TOPDIR)/rules.mk -PKG_NAME := gd -PKG_VERSION := 2.0.33 -PKG_RELEASE := 1 -PKG_MD5SUM := be0a6d326cd8567e736fbc75df0a5c45 +PKG_NAME:=gd +PKG_VERSION:=2.0.33 +PKG_RELEASE:=1 +PKG_MD5SUM:=be0a6d326cd8567e736fbc75df0a5c45 -PKG_SOURCE_SITE := http://www.boutell.com/gd/http -PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION) -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR) -PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk -PKG_CAT := zcat -PKG_IPK_DIR := $(PKG_BUILD_DIR)/ipkg +PKG_SOURCE_URL:=http://www.boutell.com/gd/http +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat -$(DL_DIR)/$(PKG_SOURCE_FILE): - $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install -$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE) - $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - $(PATCH) $(PKG_BUILD_DIR) ./patches - touch $(PKG_BUILD_DIR)/.unpacked +include $(TOPDIR)/package/rules.mk -$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked - (cd $(PKG_BUILD_DIR) ; \ +$(eval $(call PKG_template,LIBGD,libgd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) + + +$(PKG_BUILD_DIR)/.configured: + (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ - LIBPNG12_CONFIG="$(STAGING_DIR)/usr/bin/libpng12-config" \ + CFLAGS="$(TARGET_CFLAGS)" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ + LIBPNG12_CONFIG="$(STAGING_DIR)/usr/bin/libpng12-config" \ sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \ sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \ ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix="$(STAGING_DIR)/usr" \ - --disable-rpath \ - --without-x \ - --with-png=$(STAGING_DIR)/usr \ - $(DISABLE_NLS) \ + --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 \ + --without-x \ + --with-png=$(STAGING_DIR)/usr \ ) touch $(PKG_BUILD_DIR)/.configured -$(PKG_BUILD_DIR)/.libs/libgd.so: $(PKG_BUILD_DIR)/.configured +$(PKG_BUILD_DIR)/.built: + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ - CC=$(TARGET_CC) \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -L$(STAGING_DIR)/usr/lib" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ - libdir="$(STAGING_DIR)/usr/lib" \ - all + DESTDIR="$(PKG_INSTALL_DIR)" \ + all install -$(STAGING_DIR)/usr/lib/libgd.so: $(PKG_BUILD_DIR)/.libs/libgd.so - $(MAKE) -C $(PKG_BUILD_DIR) \ - install +$(IPKG_LIBGD): + install -d -m0755 $(IDIR_LIBGD)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgd.so.* $(IDIR_LIBGD)/usr/lib/ + $(RSTRIP) $(IDIR_LIBGD) + $(IPKG_BUILD) $(IDIR_LIBGD) $(PACKAGE_DIR) + +$(STAGING_DIR)/usr/lib/libgd.so: $(PKG_BUILD_DIR)/.built + mkdir -p $(STAGING_DIR)/usr/bin + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(STAGING_DIR)/usr/bin/ + mkdir -p $(STAGING_DIR)/usr/include + cp -fpR $(PKG_INSTALL_DIR)/usr/include/entities.h $(STAGING_DIR)/usr/include/ + cp -fpR $(PKG_INSTALL_DIR)/usr/include/gd*.h $(STAGING_DIR)/usr/include/ + mkdir -p $(STAGING_DIR)/usr/lib + cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/ -$(PKG_IPK): $(PKG_BUILD_DIR)/.libs/libgd.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) libgd.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) - mkdir -p $(PKG_IPK_DIR)/usr/lib - cp -a $(PKG_BUILD_DIR)/.libs/*.so* $(PKG_IPK_DIR)/usr/lib/ - $(STRIP) $(PKG_IPK_DIR)/usr/lib/* - find $(PKG_IPK_DIR) -name CVS | xargs rm -rf - mkdir -p $(PACKAGE_DIR) - $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) +install-dev: $(STAGING_DIR)/usr/lib/libgd.so -$(IPKG_STATE_DIR)/info/libgd.list: $(PKG_IPK) - $(IPKG) install $(PKG_IPK) +uninstall-dev: + rm -rf \ + $(STAGING_DIR)/usr/include/entities.h \ + $(STAGING_DIR)/usr/include/gd*.h \ + $(STAGING_DIR)/usr/lib/libgd.{a,so*} -source: $(DL_DIR)/$(PKG_SOURCE) -prepare: $(PKG_BUILD_DIR)/.unpacked -compile: $(STAGING_DIR)/usr/lib/libgd.so $(PKG_IPK) -install: $(IPKG_STATE_DIR)/info/libgd.list +compile: install-dev +clean: uninstall-dev -clean: - rm -rf $(PKG_BUILD_DIR) - rm -f $(STAGING_DIR)/usr/bin/libgd* - rm -f $(STAGING_DIR)/usr/lib/libgd* - rm -f $(PKG_IPK) diff --git a/package/libgd/ipkg/libgd.control b/package/libgd/ipkg/libgd.control new file mode 100644 index 0000000000..efdfc6edcb --- /dev/null +++ b/package/libgd/ipkg/libgd.control @@ -0,0 +1,7 @@ +Package: libgd +Priority: optional +Section: libs +Maintainer: Felix Fietkau +Source: buildroot internal +Depends: libpng +Description: A library for the dynamic creation of images diff --git a/package/libgd/libgd.control b/package/libgd/libgd.control deleted file mode 100644 index efdfc6edcb..0000000000 --- a/package/libgd/libgd.control +++ /dev/null @@ -1,7 +0,0 @@ -Package: libgd -Priority: optional -Section: libs -Maintainer: Felix Fietkau -Source: buildroot internal -Depends: libpng -Description: A library for the dynamic creation of images -- cgit v1.2.3