From 563d3f06891425bccc590fdae189f9065258e758 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 11 Jan 2014 11:54:11 +0100 Subject: fix darwin build --- package/bzip2/patches/patch-Makefile-libbz2_so | 29 +++++++++++++++++--------- package/libglew/Makefile | 2 +- 2 files changed, 20 insertions(+), 11 deletions(-) (limited to 'package') diff --git a/package/bzip2/patches/patch-Makefile-libbz2_so b/package/bzip2/patches/patch-Makefile-libbz2_so index e71dab136..605be4e5c 100644 --- a/package/bzip2/patches/patch-Makefile-libbz2_so +++ b/package/bzip2/patches/patch-Makefile-libbz2_so @@ -1,15 +1,24 @@ --- bzip2-1.0.6.orig/Makefile-libbz2_so 2010-09-11 01:07:52.000000000 +0200 -+++ bzip2-1.0.6/Makefile-libbz2_so 2013-07-30 14:15:29.000000000 +0200 -@@ -22,9 +22,10 @@ - - - SHELL=/bin/sh --CC=gcc -+CC?=gcc ++++ bzip2-1.0.6/Makefile-libbz2_so 2014-01-10 21:37:37.000000000 +0100 +@@ -25,6 +25,12 @@ SHELL=/bin/sh + CC=gcc BIGFILES=-D_FILE_OFFSET_BITS=64 --CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -+CFLAGS?= -+CFLAGS+=-fpic -fPIC -Wall -Winline $(BIGFILES) + CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++OS=$(shell uname) ++ifeq ($(OS),Darwin) ++LDOPT=-install_name ++else ++LDOPT=-soname ++endif OBJS= blocksort.o \ huffman.o \ +@@ -35,7 +41,7 @@ OBJS= blocksort.o \ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) ++ $(CC) -shared -Wl,$(LDOPT) -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.6 libbz2.so.1.0 diff --git a/package/libglew/Makefile b/package/libglew/Makefile index d6aed4f12..8fd346821 100644 --- a/package/libglew/Makefile +++ b/package/libglew/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBGLEW,libglew,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIG_STYLE:= manual -XAKE_FLAGS+= STRIP='' GLEW_DEST='${WRKINST}/usr' +XAKE_FLAGS+= STRIP='' GLEW_DEST='${WRKINST}/usr' SYSTEMS=linux libglew-install: $(INSTALL_DIR) $(IDIR_LIBGLEW)/usr/lib -- cgit v1.2.3 From abb858ae43374dc13a5fcef19b9e0ba9442013bb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 11 Jan 2014 12:16:39 +0100 Subject: fix libssh compile on Darwin --- package/libssh/Makefile | 2 +- .../patches/patch-cmake_Modules_FindZLIB_cmake | 29 ++++++++++++++++++++++ .../libssh/patches/patch-include_libssh_libssh_h | 10 ++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake create mode 100644 package/libssh/patches/patch-include_libssh_libssh_h (limited to 'package') diff --git a/package/libssh/Makefile b/package/libssh/Makefile index 8d7b455fb..997e78895 100644 --- a/package/libssh/Makefile +++ b/package/libssh/Makefile @@ -23,7 +23,7 @@ WRKBUILD= ${WRKDIR}/${PKG_NAME}-obj CONFIG_STYLE:= manual do-configure: - (cd $(WRKBUILD) && PATH='${TARGET_PATH}' \ + (cd $(WRKBUILD) && PATH='${HOST_PATH}' \ cmake -DCMAKE_SYSTEM_NAME=Linux \ -DCMAKE_INSTALL_PREFIX=/usr \ -DOPENSSL_ROOT_DIR='$(STAGING_TARGET_DIR)/usr' \ diff --git a/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake new file mode 100644 index 000000000..9a140e652 --- /dev/null +++ b/package/libssh/patches/patch-cmake_Modules_FindZLIB_cmake @@ -0,0 +1,29 @@ +--- libssh-0.5.3.orig/cmake/Modules/FindZLIB.cmake 2012-11-20 12:41:49.000000000 +0100 ++++ libssh-0.5.3/cmake/Modules/FindZLIB.cmake 2014-01-11 12:11:52.000000000 +0100 +@@ -61,11 +61,11 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI + NAMES + zlib.h + PATHS ++ ${ZLIB_ROOT_DIR}/include + /usr/local/include + /opt/local/include + /sw/include + /usr/lib/sfw/include +- ${ZLIB_ROOT_DIR}/include + ) + mark_as_advanced(ZLIB_INCLUDE_DIR) + +@@ -98,12 +98,12 @@ else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DI + zlib + zlib1 + PATHS ++ ${ZLIB_ROOT_DIR}/lib + /usr/local/lib + /opt/local/lib + /sw/lib + /usr/sfw/lib/64 + /usr/sfw/lib +- ${ZLIB_ROOT_DIR}/lib + ) + mark_as_advanced(ZLIB_LIBRARY) + diff --git a/package/libssh/patches/patch-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h new file mode 100644 index 000000000..8811f79fb --- /dev/null +++ b/package/libssh/patches/patch-include_libssh_libssh_h @@ -0,0 +1,10 @@ +--- libssh-0.5.3.orig/include/libssh/libssh.h 2012-11-20 12:41:49.000000000 +0100 ++++ libssh-0.5.3/include/libssh/libssh.h 2014-01-11 12:04:00.000000000 +0100 +@@ -57,6 +57,7 @@ + typedef unsigned long long uint64_t; + typedef int mode_t; + #else /* _MSC_VER */ ++ #include + #include + #include + #endif /* _MSC_VER */ -- cgit v1.2.3 From 73854ae887172448e95f9b39a2c94fd7369496d8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 11 Jan 2014 12:56:46 +0100 Subject: fix compile on Darwin --- package/taglib/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'package') 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)/ -- cgit v1.2.3 From 501363db19756c4f82a67b822a00e8444d3962cf Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 12 Jan 2014 12:25:26 +0100 Subject: fix build on Darwin --- package/yajl/Makefile | 4 +++- package/yajl/patches/patch-CMakeLists_txt | 4 ++-- package/yajl/patches/patch-configure | 11 ++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'package') 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| -- cgit v1.2.3