X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d5dc9a90873047ab07107833a950320ae3b2b41f..a73dfff0e74907833a83b3d20015ae5df07eae86:/package/opkg/Makefile diff --git a/package/opkg/Makefile b/package/opkg/Makefile index 67de0bcb6..6894ae7cb 100644 --- a/package/opkg/Makefile +++ b/package/opkg/Makefile @@ -1,20 +1,21 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2010 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:=513 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 include $(INCLUDE_DIR)/package.mk @@ -40,13 +41,14 @@ 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) +EXTRA_CFLAGS += $(TARGET_CPPFLAGS) CONFIGURE_ARGS += \ --disable-curl \ --disable-gpg \ + --with-opkgetcdir=/etc \ + --with-opkglockfile=/var/lock/opkg.lock define Build/Configure (cd $(PKG_BUILD_DIR); \ @@ -59,6 +61,7 @@ define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ CC="$(TARGET_CC)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ + HOST_CPU="$(PKGARCH)" \ all install endef @@ -67,11 +70,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