From 3f6bb49b0f62eedcf5fca44a73a3c4a6e057ce7c Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 18 Oct 2018 18:51:46 +0200 Subject: extra/java?-openjdk: a first build trial --- extra/java7-openjdk/PKGBUILD | 15 +++++++++++++++ extra/java8-openjdk/PKGBUILD | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 3e010da8..04ec4148 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -8,11 +8,26 @@ if [ "${CARCH}" = "i486" ]; then makedepends=(${makedepends[@]//java-rhino/}) makedepends=(${makedepends[@]//eclipse-ecj/}) + # readd implicit dependencies from above + makedepends+=(freetype2) + makedepends+=(fontconfig) + makedepends+=(cups) + makedepends+=(libxt) + makedepends+=(libxinerama) + makedepends+=(libxcomposite) + makedepends+=(libxtst) + eval "$( declare -f build | \ sed ' + s|./configure|./configure --host=i486-pc-linux-gnu --target=i486-pc-linux-gnu| s|--with-rhino|--without-rhino| s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk| + s|--enable-nss|--disable-nss| + s|./configure|./configure --disable-system-jpeg| + s|./configure|./configure --disable-system-lcms| + s|./configure|./configure --disable-system-gtk| + s|./configure|./configure --disable-compile-against-syscalls| ' )" diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD index e1f5e163..20c4d341 100644 --- a/extra/java8-openjdk/PKGBUILD +++ b/extra/java8-openjdk/PKGBUILD @@ -28,11 +28,26 @@ if [ "${CARCH}" = "i486" ]; then makedepends=(${makedepends[@]//java-rhino/}) makedepends=(${makedepends[@]//eclipse-ecj/}) + # readd implicit dependencies from above + makedepends+=(freetype2) + makedepends+=(fontconfig) + makedepends+=(cups) + makedepends+=(libxt) + makedepends+=(libxinerama) + makedepends+=(libxcomposite) + makedepends+=(libxtst) + eval "$( declare -f build | \ sed ' + s|./configure|./configure --host=i486-pc-linux-gnu --target=i486-pc-linux-gnu| s|--with-rhino|--without-rhino| s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk| + s|--enable-nss|--disable-nss| + s|./configure|./configure --disable-system-jpeg| + s|./configure|./configure --disable-system-lcms| + s|./configure|./configure --disable-system-gtk| + s|./configure|./configure --disable-compile-against-syscalls| ' )" -- cgit v1.2.3 From bc5616dbb1cd49ee036a86b793a3aea37a239103 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 18 Oct 2018 19:02:42 +0200 Subject: java i486 nss --- extra/java8-openjdk/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD index 20c4d341..de8846d9 100644 --- a/extra/java8-openjdk/PKGBUILD +++ b/extra/java8-openjdk/PKGBUILD @@ -36,6 +36,7 @@ if [ "${CARCH}" = "i486" ]; then makedepends+=(libxinerama) makedepends+=(libxcomposite) makedepends+=(libxtst) + makedepends+=(nss) eval "$( declare -f build | \ @@ -43,7 +44,6 @@ if [ "${CARCH}" = "i486" ]; then s|./configure|./configure --host=i486-pc-linux-gnu --target=i486-pc-linux-gnu| s|--with-rhino|--without-rhino| s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk| - s|--enable-nss|--disable-nss| s|./configure|./configure --disable-system-jpeg| s|./configure|./configure --disable-system-lcms| s|./configure|./configure --disable-system-gtk| -- cgit v1.2.3 From 726bf0cab908cc289ef18a67f7ad64a4106daac3 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 18 Oct 2018 19:49:25 +0200 Subject: and again.. --- extra/java7-openjdk/PKGBUILD | 1 + extra/java8-openjdk/PKGBUILD | 1 + 2 files changed, 2 insertions(+) diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 04ec4148..66263ad6 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -16,6 +16,7 @@ if [ "${CARCH}" = "i486" ]; then makedepends+=(libxinerama) makedepends+=(libxcomposite) makedepends+=(libxtst) + makedepends+=(nss) eval "$( declare -f build | \ diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD index de8846d9..b707f736 100644 --- a/extra/java8-openjdk/PKGBUILD +++ b/extra/java8-openjdk/PKGBUILD @@ -44,6 +44,7 @@ if [ "${CARCH}" = "i486" ]; then s|./configure|./configure --host=i486-pc-linux-gnu --target=i486-pc-linux-gnu| s|--with-rhino|--without-rhino| s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk| + s|--enable-nss|--disable-nss| s|./configure|./configure --disable-system-jpeg| s|./configure|./configure --disable-system-lcms| s|./configure|./configure --disable-system-gtk| -- cgit v1.2.3 From 46fd79deeb30a3e46c0dfca1a2bb6e55dd008417 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Thu, 18 Oct 2018 22:00:00 +0200 Subject: extra/java8-openjdk: i486 bootstrapped, so removed patching --- extra/java8-openjdk/PKGBUILD | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/extra/java8-openjdk/PKGBUILD b/extra/java8-openjdk/PKGBUILD index b707f736..0a99ad97 100644 --- a/extra/java8-openjdk/PKGBUILD +++ b/extra/java8-openjdk/PKGBUILD @@ -21,35 +21,4 @@ eval "$( # i486-specific if [ "${CARCH}" = "i486" ]; then _JARCH=i386 - - # a lot of things missing during bootstrapping - makedepends=(${makedepends[@]//libpulse>=0.9.11/}) - makedepends=(${makedepends[@]//gtk2/}) - makedepends=(${makedepends[@]//java-rhino/}) - makedepends=(${makedepends[@]//eclipse-ecj/}) - - # readd implicit dependencies from above - makedepends+=(freetype2) - makedepends+=(fontconfig) - makedepends+=(cups) - makedepends+=(libxt) - makedepends+=(libxinerama) - makedepends+=(libxcomposite) - makedepends+=(libxtst) - makedepends+=(nss) - - eval "$( - declare -f build | \ - sed ' - s|./configure|./configure --host=i486-pc-linux-gnu --target=i486-pc-linux-gnu| - s|--with-rhino|--without-rhino| - s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk| - s|--enable-nss|--disable-nss| - s|./configure|./configure --disable-system-jpeg| - s|./configure|./configure --disable-system-lcms| - s|./configure|./configure --disable-system-gtk| - s|./configure|./configure --disable-compile-against-syscalls| - ' - )" - fi -- cgit v1.2.3 From 7bf36c1e664cc9050ec914fa3c5418c8df05b4d5 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Fri, 19 Oct 2018 09:25:56 +0200 Subject: extra/java7-openjdk: reverted patching, doing bootstrapping manually --- extra/java7-openjdk/PKGBUILD | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index 66263ad6..154fb2ee 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,35 +1,4 @@ # i486-specific if [ "${CARCH}" = "i486" ]; then _JARCH=i386 - - # a lot of things missing during bootstrapping - makedepends=(${makedepends[@]//libpulse>=0.9.11/}) - makedepends=(${makedepends[@]//gtk2/}) - makedepends=(${makedepends[@]//java-rhino/}) - makedepends=(${makedepends[@]//eclipse-ecj/}) - - # readd implicit dependencies from above - makedepends+=(freetype2) - makedepends+=(fontconfig) - makedepends+=(cups) - makedepends+=(libxt) - makedepends+=(libxinerama) - makedepends+=(libxcomposite) - makedepends+=(libxtst) - makedepends+=(nss) - - eval "$( - declare -f build | \ - sed ' - s|./configure|./configure --host=i486-pc-linux-gnu --target=i486-pc-linux-gnu| - s|--with-rhino|--without-rhino| - s|--with-jdk-home=${JAVA_HOME}|--with-jdk-home=/opt/jdk7-openjdk| - s|--enable-nss|--disable-nss| - s|./configure|./configure --disable-system-jpeg| - s|./configure|./configure --disable-system-lcms| - s|./configure|./configure --disable-system-gtk| - s|./configure|./configure --disable-compile-against-syscalls| - ' - )" - fi -- cgit v1.2.3 From a21665f95f5a0173a34cecbbdb489b9bd0d159de Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 19 Oct 2018 14:19:28 +0200 Subject: core/linux: i486-config should not set LOCALVERSION - otherwise we end up with an "-ARCH-ARCH" suffix --- core/linux/PKGBUILD | 2 +- core/linux/config.i486 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD index a0447e94..481098cc 100644 --- a/core/linux/PKGBUILD +++ b/core/linux/PKGBUILD @@ -6,7 +6,7 @@ source_i486=('config.i486') for ((i=0; i<${#sha256sums[@]}; i++)); do if [ "${sha256sums[${i}]}" = '321af63cf7dc8e79531ddd8634eddba19e40a18335e7ce61eedd0ad72fef89a5' ]; then sha256sums_i686=('421086408df4ab3fab0aac1161c4a82cd6256f0b92b30a44259be4c4f59e0c60') - sha256sums_i486=('4fd1e49bda5c69ebbfec332e532f2fc83146861bbdde581f62b229c9f54bb336') + sha256sums_i486=('2795827c56fddbd0fb7516cfd33fdd672cf75a15c1788b9c34ed4483758b95b5') fi done diff --git a/core/linux/config.i486 b/core/linux/config.i486 index 109bd586..401d5c55 100644 --- a/core/linux/config.i486 +++ b/core/linux/config.i486 @@ -54,8 +54,8 @@ CONFIG_THREAD_INFO_IN_TASK=y # CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set -CONFIG_LOCALVERSION="-ARCH" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_LZMA=y -- cgit v1.2.3