diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-14 12:34:03 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-09-15 16:56:06 +0000 |
| commit | bce7f852848e4650bd09fd3ca52b89e9697f4e68 (patch) | |
| tree | c7724f80aa521006903e045486e9a2ee944d4899 /main/openjdk6 | |
| parent | aaa5d82eded54337d0fc09a4720e6f2b3f711fec (diff) | |
| download | aports-bce7f852848e4650bd09fd3ca52b89e9697f4e68.tar.bz2 aports-bce7f852848e4650bd09fd3ca52b89e9697f4e68.tar.xz | |
main/openjdk: fix executables to not set soname to lib.so
It confuses abuild
Diffstat (limited to 'main/openjdk6')
| -rw-r--r-- | main/openjdk6/APKBUILD | 6 | ||||
| -rw-r--r-- | main/openjdk6/icedtea-jdk-no-soname.patch | 12 |
2 files changed, 16 insertions, 2 deletions
diff --git a/main/openjdk6/APKBUILD b/main/openjdk6/APKBUILD index d126eae45..d0c5cb071 100644 --- a/main/openjdk6/APKBUILD +++ b/main/openjdk6/APKBUILD @@ -3,7 +3,7 @@ pkgname=openjdk6 pkgver=1.6.0_p24 icedteaver=1.11.4 -pkgrel=1 +pkgrel=2 pkgdesc="Sun OpenJDK 6 via IcedTea" url="http://icedtea.classpath.org/" arch="all" @@ -39,6 +39,7 @@ source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk- icedtea-jdk-execinfo.patch icedtea-jdk-no-lib-nsl.patch icedtea6-1.9.7-generate_cacerts-1.patch + icedtea-jdk-no-soname.patch " _builddir="$srcdir/icedtea6-$icedteaver" @@ -182,4 +183,5 @@ dc6a1e28a97d897d7a1057c11696727d icedtea-hotspot-uclibc-fixes.patch 7c0814181e5adc0763c5c0a24b01d4cb icedtea-jdk-iconv-uclibc.patch dae2ba8b87e2106b53974ace07e4ca72 icedtea-jdk-execinfo.patch c4bb40d5b1ff690b27900c5cd06bc1e5 icedtea-jdk-no-lib-nsl.patch -0bc0131c87fcc0d1046e3ba20d205c73 icedtea6-1.9.7-generate_cacerts-1.patch" +0bc0131c87fcc0d1046e3ba20d205c73 icedtea6-1.9.7-generate_cacerts-1.patch +d014431e70cdabb82a75e4b9ae4c28a9 icedtea-jdk-no-soname.patch" diff --git a/main/openjdk6/icedtea-jdk-no-soname.patch b/main/openjdk6/icedtea-jdk-no-soname.patch new file mode 100644 index 000000000..fe6bbb732 --- /dev/null +++ b/main/openjdk6/icedtea-jdk-no-soname.patch @@ -0,0 +1,12 @@ +--- ./openjdk/jdk/make/common/Defs-linux.gmk.orig ++++ ./openjdk/jdk/make/common/Defs-linux.gmk +@@ -248,7 +248,9 @@ + # + LDFLAGS_OPT = -Xlinker -O1 + LDFLAGS_COMMON += -L$(LIBDIR)/$(LIBARCH) ++ifdef LIBRARY + LDFLAGS_COMMON += -Wl,-soname=$(LIB_PREFIX)$(LIBRARY).$(LIBRARY_SUFFIX) ++endif + + # + # -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always |