Skip to content

Commit

Permalink
add support for ppc64le
Browse files Browse the repository at this point in the history
This also updates libffi to 3.1, because previous version
is causing compilation errors in glib.

Signed-off-by: Jan Stancek <[email protected]>
  • Loading branch information
jstancek committed Aug 7, 2014
1 parent e5decd8 commit 374a69d
Show file tree
Hide file tree
Showing 9 changed files with 146 additions and 53 deletions.
25 changes: 20 additions & 5 deletions third-party/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

ZLIB = zlib-1.2.8
BZIP2 = bzip2-1.0.6
LIBFFI = libffi-3.0.13
LIBFFI = libffi-3.1
GLIB = glib-2.38.0
LIBXML2 = libxml2-2.9.1
CURL = curl-7.29.0
Expand Down Expand Up @@ -56,14 +56,14 @@ tree/lib/pkgconfig/glib-2.0.pc: $(GLIB) $(GLIB)/.patches-done tree/lib/pkgconfig
$(MAKE) -C $(GLIB)
$(MAKE) -C $(GLIB) install

tree/lib/pkgconfig/libxml-2.0.pc: $(LIBXML2) tree/lib/pkgconfig/zlib.pc
tree/lib/pkgconfig/libxml-2.0.pc: $(LIBXML2) $(LIBXML2)/.patches-done tree/lib/pkgconfig/zlib.pc
( cd $(LIBXML2) && ./configure --prefix=$(CURDIR)/tree \
--with-zlib=$(CURDIR)/tree --without-python \
--enable-static --disable-shared )
$(MAKE) -C $(LIBXML2)
$(MAKE) -C $(LIBXML2) install

tree/lib/pkgconfig/sqlite3.pc: $(SQLITE)
tree/lib/pkgconfig/sqlite3.pc: $(SQLITE) $(SQLITE)/.patches-done
( cd $(SQLITE) && ./configure --prefix=$(CURDIR)/tree \
--enable-static --disable-shared )
$(MAKE) -C $(SQLITE)
Expand All @@ -84,7 +84,7 @@ tree/lib/pkgconfig/libsoup-2.4.pc: $(LIBSOUP) $(LIBSOUP)/.patches-done tree/lib/
( PATH=$(CURDIR)/tree/bin:$(PATH) $(MAKE) -C $(LIBSOUP) )
$(MAKE) -C $(LIBSOUP) install

tree/lib/pkgconfig/libcurl.pc: $(CURL) tree/lib/pkgconfig/zlib.pc
tree/lib/pkgconfig/libcurl.pc: $(CURL) $(CURL)/.patches-done tree/lib/pkgconfig/zlib.pc
( cd $(CURL) && PKG_CONFIG_PATH=../tree/lib/pkgconfig ./configure --prefix=$(CURDIR)/tree \
--with-zlib=$(CURDIR)/tree --with-ssl --enable-ipv6 --disable-manual \
--enable-static --disable-shared )
Expand Down Expand Up @@ -156,12 +156,21 @@ tarballs: $(TAR_BALLS)
%: %.tar.xz tree/lib/pkgconfig/liblzma.pc
$(CURDIR)/tree/bin/xzcat $< | tar -xf -

$(CURL)/.patches-done:
patch -d$(CURL) -p1 <curl_add_ppc64le.patch
touch $@

$(XZ)/.patches-done:
patch -d$(XZ) -p1 <xz-no-pkgconfig-url.patch
patch -d$(XZ) -p1 <xz_add_ppc64le.patch
touch $@

$(LIBFFI)/.patches-done:
patch -d$(LIBFFI) -p1 <libffi-3.0.13-toolexeclibdir.patch
patch -d$(LIBFFI) -p1 <libffi-3.1-toolexeclibdir.patch
touch $@

$(SQLITE)/.patches-done:
patch -d$(SQLITE) -p1 <sqlite_add_ppc64le.patch
touch $@

$(GLIB)/.patches-done:
Expand All @@ -174,11 +183,17 @@ $(GLIB)/.patches-done:
$(LIBARCHIVE)/.patches-done:
# patch -d$(LIBARCHIVE) -p1 <libarchive-rhel3-headers.patch
patch -d$(LIBARCHIVE) -p1 <libarchive-use-pkgconfig.patch
patch -d$(LIBARCHIVE) -p1 <libarchive_add_ppc64le.patch
touch $@

$(LIBSOUP)/.patches-done:
patch -d$(LIBSOUP) -p1 <libsoup-no-pkgconfig-version-check.patch
patch -d$(LIBSOUP) -p1 <libsoup-perl580.patch
patch -d$(LIBSOUP) -p1 <libsoup_add_ppc64le.patch
touch $@

$(LIBXML2)/.patches-done:
patch -d$(LIBXML2) -p1 <libxml2_add_ppc64le.patch
touch $@

.PHONY: clean
Expand Down
14 changes: 14 additions & 0 deletions third-party/curl_add_ppc64le.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/config.guess b/config.guess
index d622a44..c171a4a 100755
--- a/config.guess
+++ b/config.guess
@@ -972,6 +972,9 @@ EOF
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
14 changes: 14 additions & 0 deletions third-party/libarchive_add_ppc64le.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/build/autoconf/config.guess b/build/autoconf/config.guess
index 6ea3454..1784b76 100755
--- a/build/autoconf/config.guess
+++ b/build/autoconf/config.guess
@@ -973,6 +973,9 @@ EOF
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
48 changes: 0 additions & 48 deletions third-party/libffi-3.0.13-toolexeclibdir.patch

This file was deleted.

42 changes: 42 additions & 0 deletions third-party/libffi-3.1-toolexeclibdir.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
diff --git a/configure b/configure
index a05785e..838cd2f 100755
--- a/configure
+++ b/configure
@@ -18792,11 +18792,11 @@ if test "x$GCC" = "xyes"; then
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
- multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
- case $multi_os_directory in
- .) ;; # Avoid trailing /.
- ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
- esac
+# multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
+# case $multi_os_directory in
+# .) ;; # Avoid trailing /.
+# ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+# esac

else
toolexeclibdir='$(libdir)'
diff --git a/configure.ac b/configure.ac
index d3b8b99..a303ae4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -596,11 +596,11 @@ if test "x$GCC" = "xyes"; then
toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
- multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
- case $multi_os_directory in
- .) ;; # Avoid trailing /.
- ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
- esac
+# multi_os_directory=`$CC $CFLAGS -print-multi-os-directory`
+# case $multi_os_directory in
+# .) ;; # Avoid trailing /.
+# ../*) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+# esac
AC_SUBST(toolexecdir)
else
toolexeclibdir='$(libdir)'
14 changes: 14 additions & 0 deletions third-party/libsoup_add_ppc64le.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/config.guess b/config.guess
index c0adba9..f589b5f 100755
--- a/config.guess
+++ b/config.guess
@@ -972,6 +972,9 @@ EOF
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
14 changes: 14 additions & 0 deletions third-party/libxml2_add_ppc64le.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/config.guess b/config.guess
index d622a44..c171a4a 100755
--- a/config.guess
+++ b/config.guess
@@ -972,6 +972,9 @@ EOF
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
14 changes: 14 additions & 0 deletions third-party/sqlite_add_ppc64le.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/config.guess b/config.guess
index d622a44..c171a4a 100755
--- a/config.guess
+++ b/config.guess
@@ -972,6 +972,9 @@ EOF
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
14 changes: 14 additions & 0 deletions third-party/xz_add_ppc64le.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/build-aux/config.guess b/build-aux/config.guess
index d622a44..1e5d46f 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -975,6 +975,9 @@ EOF
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
exit ;;
+ ppc64le:Linux:*:*)
+ echo powerpc64le-unknown-linux-gnu
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit ;;

0 comments on commit 374a69d

Please sign in to comment.