summaryrefslogtreecommitdiff
path: root/gforth
diff options
context:
space:
mode:
authorRobin Haberkorn <robin.haberkorn@googlemail.com>2011-01-02 23:27:23 +0100
committerRobin Haberkorn <robin.haberkorn@googlemail.com>2011-01-02 23:27:23 +0100
commit9352995934adec8059077af241c35ccd1573bd80 (patch)
tree60286e266b3b31b90b952ac37e12a1ebbcdd2eb6 /gforth
parentef3b84d78197acbd45d73a9b1ae44b47b5904290 (diff)
parent880bca260c4ce91554a49b2475232cf5c0ffd447 (diff)
downloadqipackages-fork-9352995934adec8059077af241c35ccd1573bd80.tar.gz
Merge branch 'master' of git://projects.qi-hardware.com/openwrt-packagesHEADmaster
Conflicts: links/Makefile
Diffstat (limited to 'gforth')
-rw-r--r--gforth/Makefile19
1 files changed, 13 insertions, 6 deletions
diff --git a/gforth/Makefile b/gforth/Makefile
index aeb0b74..9e3e474 100644
--- a/gforth/Makefile
+++ b/gforth/Makefile
@@ -18,7 +18,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gforth
PKG_SNAPSHOT_DATE=20100918
PKG_VERSION=0.7.0-$(PKG_SNAPSHOT_DATE)
-PKG_RELEASE:=1
+PKG_RELEASE:=3
PKG_BUILD_DEPENDS:= gforth/host libltdl/host libtool/host libffi
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -30,7 +30,6 @@ PKG_SOURCE_URL:=\
http://mosquito.dyndns.tv/~spock/
#PKG_SOURCE_URL:= file://~/forth/gforth/
PKG_MD5SUM:=5ada9cc3f72fea8ea002bbae4b39d118
-#f912b58c2434a9e1df7d4f8db75636da
# Alternate download #1 via CVS: this doesn't work, as CVS is missing the
# kernel.fi images needed for boot-strapping :(
@@ -277,7 +276,7 @@ define Package/gforth/install
# install the correct Gforth kernel image
echo "$(INSTALL_DATA) $(PKG_BUILD_DIR)/@kernel_fi@ $(1)/$(GFORTH_SHARE_DIR)/" > $(PKG_BUILD_DIR)/install-kernel.sh.in
- $(PKG_BUILD_DIR)/config.status --file $(PKG_BUILD_DIR)/install-kernel.sh
+ cd $(PKG_BUILD_DIR) && ./config.status --file install-kernel.sh
. $(PKG_BUILD_DIR)/install-kernel.sh
# install updating script and wrap gforth interpreter binaries so that
@@ -299,9 +298,12 @@ define Package/gforth/install
# install pre-generated C-interface wrappers (libcc)
-for i in $(LIBCC_BUILD_SRC); do \
- libtool --mode=install $(INSTALL_BIN) \
+ which libtool; \
+ ls -l $(PKG_BUILD_LIBCC_DIR)/.libs; \
+ libtool --mode=install $(INSTALL_DATA) \
$(PKG_BUILD_LIBCC_DIR)/`basename $$$$i .fs`.la \
$(1)/$(GFORTH_LIBCC_DIR)/; \
+ ls -l $(1)/$(GFORTH_LIBCC_DIR)/; \
done
# -libtool --finish $(1)/$(GFORTH_LIBCC_DIR)
-rm -f $(1)/$(GFORTH_LIBCC_DIR)/*.a
@@ -311,12 +313,17 @@ endef
## installed source code.
define Package/gforth/postinst
#! /bin/sh
-$(GFORTH_BIN_DIR)/gforth-update-image
+if [ -z "$$IPKG_OFFLINE_ROOT" ]; then
+ # only attempt to update image on target, never on host
+ $(GFORTH_BIN_DIR)/gforth-update-image
+fi
endef
define Package/gforth/prerm
#! /bin/sh
-rm -f $(GFORTH_LIB_DIR)/gforth.fi
+if [ -z "$$IPKG_OFFLINE_ROOT" ]; then
+ rm -f $(GFORTH_LIB_DIR)/gforth.fi
+fi
endef
$(eval $(call HostBuild))