summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/ecj/Makefile2
-rw-r--r--package/gcj/Makefile4
-rw-r--r--package/id3lib/Makefile2
-rw-r--r--package/id3lib/patches/patch-configure20
4 files changed, 23 insertions, 5 deletions
diff --git a/package/ecj/Makefile b/package/ecj/Makefile
index 92898307b..8e4dc6f94 100644
--- a/package/ecj/Makefile
+++ b/package/ecj/Makefile
@@ -24,7 +24,7 @@ ecj-hostinstall:
$(STAGING_HOST_DIR)/usr/bin/gcj -lgcj -O2 -findirect-dispatch \
-o ${STAGING_HOST_DIR}/usr/bin/ecj.native \
--main=org.eclipse.jdt.internal.compiler.batch.Main \
- $(DISTDIR)/ecj.jar
+ $(DL_DIR)/ecj.jar
echo "env LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib:$(STAGING_HOST_DIR)/usr/lib64 ${STAGING_HOST_DIR}/usr/bin/ecj.native \$$@" > \
${STAGING_HOST_DIR}/usr/bin/ecj
chmod u+x ${STAGING_HOST_DIR}/usr/bin/ecj
diff --git a/package/gcj/Makefile b/package/gcj/Makefile
index 5ff8cc810..15c56b204 100644
--- a/package/gcj/Makefile
+++ b/package/gcj/Makefile
@@ -41,8 +41,8 @@ HOST_CONFIGURE_ARGS:= --enable-dependency-tracking \
--disable-bootstrap
post-extract:
- (cd $(DISTDIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
- (cd $(WRKBUILD); $(CP) $(DISTDIR)/ecj.jar .)
+ (cd $(DL_DIR); wget -O ecj.jar ftp://sourceware.org/pub/java/ecj-4.9.jar)
+ (cd $(WRKBUILD); $(CP) $(DL_DIR)/ecj.jar .)
include ${TOPDIR}/mk/host-bottom.mk
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/id3lib/Makefile b/package/id3lib/Makefile
index 389b4f39a..19d678a7a 100644
--- a/package/id3lib/Makefile
+++ b/package/id3lib/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= id3lib
PKG_VERSION:= 3.8.3
-PKG_RELEASE:= 1
+PKG_RELEASE:= 2
PKG_MD5SUM:= 19f27ddd2dda4b2d26a559a4f0f402a7
PKG_DESCR:= An ID3v1/ID3v2 tagging library
PKG_SECTION:= libs
diff --git a/package/id3lib/patches/patch-configure b/package/id3lib/patches/patch-configure
index 6853215af..10b0add38 100644
--- a/package/id3lib/patches/patch-configure
+++ b/package/id3lib/patches/patch-configure
@@ -1,6 +1,24 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- id3lib-3.8.3.orig/configure 2003-03-02 01:23:00.000000000 +0100
-+++ id3lib-3.8.3/configure 2008-12-15 13:14:18.000000000 +0100
++++ id3lib-3.8.3/configure 2014-03-08 12:16:00.000000000 +0100
+@@ -3353,7 +3353,7 @@ irix5* | irix6*)
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+ case $host_cpu in
+ alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
+ lt_cv_deplibs_check_method=pass_all ;;
+@@ -6142,7 +6142,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+ ;;
+
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
@@ -10296,7 +10296,7 @@ done
for ac_header in \