Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 21 insertions, 8 deletions

diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile
index 33c33f7e7..a20bfd0a6 100644
--- a/package/iproute2/Makefile
+++ b/package/iproute2/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		iproute2
 PKG_VERSION:=		3.12.0
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		f87386aaaecafab95607fd10e8152c68
 PKG_DESCR:=		iproute2 routing control utility
 PKG_SECTION:=		route
@@ -46,8 +46,7 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK
 
 CONFIG_STYLE:=		minimal
 TARGET_CFLAGS+=		-D_GNU_SOURCE
-XAKE_FLAGS+=		CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" \
-			CFLAGS_FOR_BUILD+="-I${LINUX_DIR}/include"
+XAKE_FLAGS+=		CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\""
 CONFIGURE_ENV+=		CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}"
 
 ip-install:
diff --git a/package/taglib/Makefile b/package/taglib/Makefile
index a71973676..402b89c7f 100644
--- a/package/taglib/Makefile
+++ b/package/taglib/Makefile
@@ -22,7 +22,10 @@ $(eval $(call PKG_template,TAGLIB,taglib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 CONFIG_STYLE:=		manual
 
 do-configure:
-	(cd ${WRKBUILD} && PATH='${TARGET_PATH}' cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .)
+	(cd ${WRKBUILD} && PATH='${HOST_PATH}' \
+		cmake -DZLIB_ROOT=$(STAGING_TARGET_DIR)/usr \
+			-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+			-DCMAKE_SYSTEM_NAME=Linux .)
 
 pre-install:
 	$(INSTALL_DATA) ./files/taglib.pc $(WRKBUILD)/
diff --git a/package/yajl/Makefile b/package/yajl/Makefile
index 79248e4d9..ff1537599 100644
--- a/package/yajl/Makefile
+++ b/package/yajl/Makefile
@@ -14,6 +14,8 @@ PKG_URL:=		http://lloyd.github.com/yajl/
 PKG_SITES:=		http://openadk.org/distfiles/
 PKG_OPTS:=		dev
 
+PKG_NOPARALLEL:=	1
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
@@ -21,7 +23,7 @@ $(eval $(call PKG_template,YAJL,yajl,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS
 CONFIG_STYLE:=		manual
 
 do-configure:
-	(cd ${WRKBUILD} && PATH='${TARGET_PATH}' ./configure --prefix /usr)
+	(cd ${WRKBUILD} && PATH='${HOST_PATH}' ./configure --prefix /usr)
 
 yajl-install:
 	$(INSTALL_DIR) $(IDIR_YAJL)/usr/lib
diff --git a/package/yajl/patches/patch-CMakeLists_txt b/package/yajl/patches/patch-CMakeLists_txt
index c1405d6c9..4f0b3f936 100644
--- a/package/yajl/patches/patch-CMakeLists_txt
+++ b/package/yajl/patches/patch-CMakeLists_txt
@@ -1,6 +1,6 @@
 --- yajl-2.0.1.orig/CMakeLists.txt	2011-04-28 04:48:41.000000000 +0200
-+++ yajl-2.0.1/CMakeLists.txt	2013-07-30 15:20:53.000000000 +0200
-@@ -64,16 +64,5 @@ ENDIF (WIN32)
++++ yajl-2.0.1/CMakeLists.txt	2014-01-11 13:05:10.000000000 +0100
+@@ -64,16 +64,5 @@ ENDIF (WIN32) 
  
  
  ADD_SUBDIRECTORY(src)
diff --git a/package/yajl/patches/patch-configure b/package/yajl/patches/patch-configure
index 8ab73fc1c..1153f407c 100644
--- a/package/yajl/patches/patch-configure
+++ b/package/yajl/patches/patch-configure
@@ -1,5 +1,14 @@
 --- yajl-2.0.1.orig/configure	2011-04-28 04:48:41.000000000 +0200
-+++ yajl-2.0.1/configure	2013-07-30 15:34:21.000000000 +0200
++++ yajl-2.0.1/configure	2014-01-11 13:06:37.000000000 +0100
+@@ -38,7 +38,7 @@ FileUtils.rm_f("Makefile")
+ puts "== running CMake in build directory"
+ FileUtils.mkdir("build")
+ FileUtils.cd("build") do 
+-  if (!system("cmake -DCMAKE_INSTALL_PREFIX='#{prefix}' .."))
++  if (!system("cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_INSTALL_PREFIX='#{prefix}' .."))
+     puts "The \"cmake\" program is required to configure yajl.  It's"
+     puts "available from most ports/packaging systems and http://cmake.org"
+     exit 1
 @@ -49,7 +49,7 @@ end
  puts "== Generating Makefile"
  File.open("Makefile", "w+") do |f|