فهرست منبع

fix some cross-compile errors on debian7

Waldemar Brodkorb 10 سال پیش
والد
کامیت
cc2e9a12c4
4فایلهای تغییر یافته به همراه8 افزوده شده و 5 حذف شده
  1. 2 1
      package/libmicrohttpd/Makefile
  2. 2 1
      package/sdl-image/Makefile
  3. 1 0
      package/xbmc/Makefile
  4. 3 3
      package/xbmc/patches/patch-configure_in

+ 2 - 1
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

+ 2 - 1
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 \

+ 1 - 0
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 \

+ 3 - 3
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.)