Merge pull request #3250 from wsnipex/buildsteps

fix linux building with unified deps

diff --git a/configure.in b/configure.in
index 0337705..7473268 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -615,9 +615,17 @@ case $host in
      ;;
   i*86*-linux-gnu*)
      ARCH="i486-linux"
+     if test "$use_cpu" = "no" -a "$cross_compiling" = "yes";  then
+        use_arch="x86"
+        use_cpu="i686"
+     fi
      ;;
   x86_64-*-linux-gnu*)
      ARCH="x86_64-linux"
+     if test "$use_cpu" = "no" -a "$cross_compiling" = "yes";  then
+        use_arch="x86_64"
+        use_cpu="x86_64"
+     fi
      ;;
   i386-*-freebsd*)
      ARCH="x86-freebsd"

diff --git a/tools/buildsteps/linux64/configure-xbmc b/tools/buildsteps/linux64/configure-xbmc
index 38a5e2d..ad509b4 100755 (executable)
--- a/tools/buildsteps/linux64/configure-xbmc
+++ b/tools/buildsteps/linux64/configure-xbmc
@@ -2,4 +2,4 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
 XBMC_PLATFORM_DIR=linux64
 . $WORKSPACE/tools/buildsteps/defaultenv
 
-cd $WORKSPACE/;./configure
+make -C $WORKSPACE/tools/depends/target/xbmc

diff --git a/tools/buildsteps/linux64/make-depends b/tools/buildsteps/linux64/make-depends
index c9c98aa..1c27c13 100755 (executable)
--- a/tools/buildsteps/linux64/make-depends
+++ b/tools/buildsteps/linux64/make-depends
@@ -4,6 +4,6 @@ XBMC_PLATFORM_DIR=linux64
 
 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ]
 then
-  cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS && tagSuccessFulBuild .
+  cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS || make && tagSuccessFulBuild .
 fi
 

diff --git a/tools/buildsteps/linux64/make-xbmc b/tools/buildsteps/linux64/make-xbmc
index 10200c8..0a65536 100755 (executable)
--- a/tools/buildsteps/linux64/make-xbmc
+++ b/tools/buildsteps/linux64/make-xbmc
@@ -2,4 +2,4 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )}
 XBMC_PLATFORM_DIR=linux64
 . $WORKSPACE/tools/buildsteps/defaultenv
 
-cd $WORKSPACE;make -j$BUILDTHREADS
+cd $WORKSPACE;make -j$BUILDTHREADS || make

diff --git a/tools/buildsteps/linux64/package b/tools/buildsteps/linux64/package
index 243f509..e2b167d 100755 (executable)
--- a/tools/buildsteps/linux64/package
+++ b/tools/buildsteps/linux64/package
@@ -3,8 +3,3 @@ XBMC_PLATFORM_DIR=linux64
 . $WORKSPACE/tools/buildsteps/defaultenv
 
 #nothing for linux atm
-
-#rename for upload
-#e.x. xbmc-20130314-8c2fb31-Frodo-armeabi-v7a.apk
-UPLOAD_FILENAME="xbmc-$(getBuildRevDateStr)-armeabi-v7a.apk"
-#mv xbmcapp-armeabi-*.apk $UPLOAD_FILENAME

diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index 0209720..37fae5b 100644 (file)
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -52,9 +52,11 @@ ifeq ($(NEED_LIBICONV),1)
 endif
 
 ALSA_LIB=
+LINUX_SYSTEM_LIBS=
 ifeq ($(OS),linux)
-  DEPENDS += alsa-lib
+  DEPENDS += alsa-lib libsdl linux-system-libs
   ALSA_LIB = alsa-lib
+  LINUX_SYSTEM_LIBS = linux-system-libs
 endif
 
 .PHONY: $(DEPENDS)
@@ -86,6 +88,7 @@ libmp3lame: $(ICONV)
 libpng: $(ZLIB)
 openssl: $(ZLIB)
 pythonmodule-pil: $(ZLIB) libjpeg-turbo libpng freetype2 python26
+libsdl: $(LINUX_SYSTEM_LIBS)
 
 .installed-$(PLATFORM): $(DEPENDS)
        touch $@
@@ -110,3 +113,17 @@ test-dependencies:
 distclean::
        for d in $(DEPENDS); do $(MAKE) -C $$d distclean; done
 
+linux-system-libs:
+       [ -f $(PREFIX)/lib/pkgconfig/x11.pc ] || ln -s /usr/lib/$(HOST)/pkgconfig/x11.pc $(PREFIX)/lib/pkgconfig/x11.pc
+       [ -f $(PREFIX)/lib/pkgconfig/xproto.pc ] || ln -s /usr/share/pkgconfig/xproto.pc $(PREFIX)/lib/pkgconfig/xproto.pc
+       [ -f $(PREFIX)/lib/pkgconfig/kbproto.pc ] || ln -s /usr/share/pkgconfig/kbproto.pc $(PREFIX)/lib/pkgconfig/kbproto.pc
+       [ -f $(PREFIX)/lib/pkgconfig/xcb.pc ] || ln -s /usr/lib/$(HOST)/pkgconfig/xcb.pc $(PREFIX)/lib/pkgconfig/xcb.pc
+       [ -f $(PREFIX)/lib/pkgconfig/pthread-stubs.pc ] || ln -s /usr/lib/$(HOST)/pkgconfig/pthread-stubs.pc $(PREFIX)/lib/pkgconfig/pthread-stubs.pc
+       [ -f $(PREFIX)/lib/pkgconfig/xau.pc ] || ln -s /usr/lib/$(HOST)/pkgconfig/xau.pc $(PREFIX)/lib/pkgconfig/xau.pc
+       [ -f $(PREFIX)/lib/pkgconfig/xdmcp.pc ] || ln -s /usr/lib/$(HOST)/pkgconfig/xdmcp.pc $(PREFIX)/lib/pkgconfig/xdmcp.pc
+       [ -f $(PREFIX)/lib/pkgconfig/xext.pc ] || ln -s /usr/lib/$(HOST)/pkgconfig/xext.pc $(PREFIX)/lib/pkgconfig/xext.pc
+       [ -f $(PREFIX)/lib/pkgconfig/xextproto.pc ] || ln -s /usr/share/pkgconfig/xextproto.pc $(PREFIX)/lib/pkgconfig/xextproto.pc
+       [ -f $(PREFIX)/lib/pkgconfig/xt.pc ] || ln -s /usr/lib/$(HOST)/pkgconfig/xt.pc $(PREFIX)/lib/pkgconfig/xt.pc
+       [ -f $(PREFIX)/lib/pkgconfig/ice.pc ] || ln -s /usr/lib/$(HOST)/pkgconfig/ice.pc $(PREFIX)/lib/pkgconfig/ice.pc
+       [ -f $(PREFIX)/lib/pkgconfig/sm.pc ] || ln -s /usr/lib/$(HOST)/pkgconfig/sm.pc $(PREFIX)/lib/pkgconfig/sm.pc
+       [ -f $(PREFIX)/lib/pkgconfig/xmu.pc ] || ln -s /usr/lib/$(HOST)/pkgconfig/xmu.pc $(PREFIX)/lib/pkgconfig/xmu.pc

diff --git a/tools/depends/target/libsdl/Makefile b/tools/depends/target/libsdl/Makefile
index a03df59..b4c3504 100644 (file)
--- a/tools/depends/target/libsdl/Makefile
+++ b/tools/depends/target/libsdl/Makefile
@@ -8,8 +8,10 @@ SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.gz
 
 # configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) \
-  --without-x --disable-video-x11 --disable-video-directfb
+CONFIGURE=./configure --prefix=$(PREFIX) --disable-video-directfb
+ifneq ($(OS),linux)
+CONFIGURE += --without-x --disable-video-x11
+endif
 
 LIBDYLIB=$(PLATFORM)/build/.libs/lib$(LIBNAME).so