X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d5dc9a90873047ab07107833a950320ae3b2b41f..7d535a19ed0de3bfbb009c56d3032d23b1eb914a:/package/opkg/Makefile?ds=sidebyside diff --git a/package/opkg/Makefile b/package/opkg/Makefile index 67de0bcb6..07d3c81b6 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -1,28 +1,33 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=opkg -PKG_REV:=4564 +PKG_REV:=618 PKG_VERSION:=$(PKG_REV) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=svn PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION) -PKG_SOURCE_URL:=http://svn.openmoko.org/trunk/src/target/opkg/ +PKG_SOURCE_URL:=http://opkg.googlecode.com/svn/trunk/ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz -PKG_FIXUP = libtool +PKG_FIXUP:=autoreconf +PKG_REMOVE_FILES = autogen.sh aclocal.m4 + include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/host-build.mk define Package/opkg SECTION:=base CATEGORY:=Base system TITLE:=opkg package management system + MAINTAINER:=Jo-Philipp Wich URL:=http://wiki.openmoko.org/wiki/Opkg endef @@ -40,25 +45,22 @@ define Package/opkg/conffiles /etc/opkg.conf endef -TARGET_CFLAGS += $(FPIC) -EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/lib -EXTRA_LDFLAGS+=-L$(STAGING_DIR)/usr/lib -Wl,-rpath-link,$(STAGING_DIR)/usr/lib +TARGET_CFLAGS += $(if $(CONFIG_GCC_VERSION_4_3)$(CONFIG_GCC_VERSION_4_4),-Wno-array-bounds) +TARGET_CFLAGS += -ffunction-sections -fdata-sections +EXTRA_CFLAGS += $(TARGET_CPPFLAGS) CONFIGURE_ARGS += \ --disable-curl \ --disable-gpg \ - -define Build/Configure - (cd $(PKG_BUILD_DIR); \ - autoreconf -v --install || exit 1 \ - ); - $(call Build/Configure/Default) -endef + --with-opkgetcdir=/etc \ + --with-opkglockfile=/var/lock/opkg.lock define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ + HOST_CPU="$(PKGARCH)" \ + LDFLAGS="-Wl,--gc-sections" \ all install endef @@ -67,11 +69,8 @@ define Package/opkg/install $(INSTALL_DIR) $(1)/bin $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) ./files/opkg.conf $(1)/etc/ - $(SED) 's,$$$$S,$(BOARD),g' -e 's,$$$$A,$(ARCH),g' $(1)/etc/opkg.conf - $(SED) 's,$$$$S,$(BOARD),g' $(1)/etc/opkg.conf + $(SED) 's,$$$$S,$(PKGARCH),g' $(1)/etc/opkg.conf $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/opkg-cl $(1)/bin/opkg - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopkg.so.* $(1)/usr/lib/ endef define Build/InstallDev @@ -79,4 +78,20 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/libopkg $(1)/usr/include/ endef + +HOST_CONFIGURE_ARGS+= \ + --disable-curl \ + --disable-gpg \ + --with-opkgetcdir=/etc \ + --with-opkglockfile=/tmp/opkg.lock + +define Host/Compile + $(MAKE) -C $(HOST_BUILD_DIR) CC="$(HOSTCC)" all +endef + +define Host/Install + $(INSTALL_BIN) $(HOST_BUILD_DIR)/src/opkg-cl $(STAGING_DIR_HOST)/bin/opkg +endef + $(eval $(call BuildPackage,opkg)) +$(eval $(call HostBuild))