diff options
| author |   Eric Hameleers <alien@slackware.com> | 2012-08-02 21:10:39 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2012-08-02 21:10:39 +0000 |
| commit | fae21e8e7f16eaff5ee6907dabf119845e9ca929 (patch) | |
| tree | 8983a17590123865e845009fb8c466f02c291d70 /openjdk/build/openjdk.SlackBuild | |
| parent | 4e640adf3a164ff619646850687955f7677bd03a (diff) | |
| download | asb-fae21e8e7f16eaff5ee6907dabf119845e9ca929.tar.gz asb-fae21e8e7f16eaff5ee6907dabf119845e9ca929.tar.xz | |
Fix a few bugs
Diffstat (limited to 'openjdk/build/openjdk.SlackBuild')
| -rwxr-xr-x | openjdk/build/openjdk.SlackBuild | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/openjdk/build/openjdk.SlackBuild b/openjdk/build/openjdk.SlackBuild index b509bb27..11ff90fd 100755 --- a/openjdk/build/openjdk.SlackBuild +++ b/openjdk/build/openjdk.SlackBuild @@ -188,6 +188,9 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$TARGET #--with-javac=${JVMDIR}/bin/javac \ +# In bootstrap build on Slackware 14, avoid a DSO linking error: +sed -i -e "s/-o native-ecj/-lgcj -o native-ecj/" Makefile + make VERBOSE=TRUE || exit 1 # Move the generated jre and sdk images to the respective packages: @@ -217,10 +220,10 @@ else fi # Pick a selection of fontconfig files: -cp -a $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.properties.src -cp -a $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.bfc -cp -a $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.properties.src -cp -a $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig.{Ubuntu,}.bfc +cp -a $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig{.Ubuntu,}.properties.src +cp -a $PKG1/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig{.Ubuntu,}.bfc +cp -a $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig{.Ubuntu,}.properties.src +cp -a $PKG2/usr/lib${LIBDIRSUFFIX}/java/jre/lib/fontconfig{.Ubuntu,}.bfc # Symlinks are present in Slackware historically: ( cd $PKG1/usr/lib${LIBDIRSUFFIX} |