diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-10 14:46:46 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-10 14:47:10 +0200 |
| commit | cc2e9a12c4d7f801b8ab8b4f9be1545dd004926d (patch) | |
| tree | e465647677c8d71baade682e3877ea37efe2a89b /package | |
| parent | 22bd6214b21e6a6a3bf407baf2270d4c96c1632d (diff) | |
fix some cross-compile errors on debian7
Diffstat (limited to 'package')
| -rw-r--r-- | package/libmicrohttpd/Makefile | 3 | ||||
| -rw-r--r-- | package/sdl-image/Makefile | 3 | ||||
| -rw-r--r-- | package/xbmc/Makefile | 1 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-configure_in | 6 |
4 files changed, 8 insertions, 5 deletions
diff --git a/package/libmicrohttpd/Makefile b/package/libmicrohttpd/Makefile index f5b662417..1a3afe3e4 100644 --- a/package/libmicrohttpd/Makefile +++ b/package/libmicrohttpd/Makefile @@ -21,7 +21,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBMICROHTTPD,libmicrohttpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -CONFIGURE_ARGS+= --with-libgcrypt-prefix=$(STAGING_TARGET_DIR)/usr +CONFIGURE_ARGS+= --with-libgcrypt-prefix=$(STAGING_TARGET_DIR)/usr \ + --disable-spdy libmicrohttpd-install: $(INSTALL_DIR) $(IDIR_LIBMICROHTTPD)/usr/lib diff --git a/package/sdl-image/Makefile b/package/sdl-image/Makefile index b2546aac9..074fd6a6a 100644 --- a/package/sdl-image/Makefile +++ b/package/sdl-image/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= sdl-image PKG_VERSION:= 1.2.10 PKG_RELEASE:= 2 PKG_MD5SUM:= 6c06584b31559e2b59f2b982d0d1f628 -PKG_DESCR:= Simple DirectMedia Layer +PKG_DESCR:= simple directMedia layer image library PKG_SECTION:= libs PKG_DEPENDS:= libpng libtiff libjpeg-turbo libsdl PKG_BUILDDEP:= sdl-image-host libpng libtiff libjpeg-turbo sdl @@ -31,6 +31,7 @@ LDFLAGS_FOR_BUILD+= -framework Cocoa endif HOST_STYLE:= auto +HOST_CONFIGURE_ARGS+= --disable-png-shared CONFIGURE_ARGS+= --enable-png \ --enable-jpg \ --enable-bmp \ diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index 2cabfd729..d5f8b1668 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -45,6 +45,7 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CXXFLAGS_FOR_BUILD+= $(CPPFLAGS_FOR_BUILD) +LDFLAGS_FOR_BUILD+= -Wl,-rpath -Wl,${STAGING_HOST_DIR}/usr/lib XAKE_FLAGS+= V=1 TIXML_USE_STL=1 XAKE_FLAGS+= GCC_HONOUR_COPTS=s TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \ diff --git a/package/xbmc/patches/patch-configure_in b/package/xbmc/patches/patch-configure_in index 0f6c1689c..c8e47aaf2 100644 --- a/package/xbmc/patches/patch-configure_in +++ b/package/xbmc/patches/patch-configure_in @@ -1,5 +1,5 @@ ---- xbmc-13.0rc1.orig/configure.in 2014-04-30 15:45:07.000000000 +0200 -+++ xbmc-13.0rc1/configure.in 2014-05-03 11:22:45.000000000 +0200 +--- xbmc-13.0.orig/configure.in 2014-05-07 15:29:25.000000000 +0200 ++++ xbmc-13.0/configure.in 2014-05-08 20:43:08.000000000 +0200 @@ -600,7 +600,12 @@ PKG_PROG_PKG_CONFIG MAKE="${MAKE:-make}" OBJDUMP="${OBJDUMP:-objdump}" @@ -58,7 +58,7 @@ ;; arm*-*linux-android*) target_platform=target_android -@@ -1047,7 +1052,7 @@ if test "$use_gles" = "yes"; then +@@ -1048,7 +1053,7 @@ if test "$use_gles" = "yes"; then AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."]) AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."]) AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.) |