------------------------------------------------------------ revno: 738 committer: Matthias Klose <[email protected]> branch nick: openjdk8 timestamp: Thu 2019-03-28 08:25:41 +0100 message: Configure --with-vendor-name. added: debian/patches/8193764.diff modified: debian/changelog debian/control debian/control.in debian/rules
-- lp:~openjdk/openjdk/openjdk8 https://code.launchpad.net/~openjdk/openjdk/openjdk8 Your team Debian Java Maintainers is subscribed to branch lp:~openjdk/openjdk/openjdk8. To unsubscribe from this branch go to https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'debian/changelog' --- debian/changelog 2019-03-19 10:24:11 +0000 +++ debian/changelog 2019-03-28 07:25:41 +0000 @@ -1,3 +1,9 @@ +openjdk-8 (8u212-b01-2) UNRELEASED; urgency=medium + + * Configure --with-vendor-name. + + -- Matthias Klose <[email protected]> Thu, 28 Mar 2019 08:20:50 +0100 + openjdk-8 (8u212-b01-1) unstable; urgency=medium * Update to 8u212-b01. === modified file 'debian/control' --- debian/control 2019-03-17 17:24:49 +0000 +++ debian/control 2019-03-28 07:25:41 +0000 @@ -5,8 +5,8 @@ Uploaders: Matthias Klose <[email protected]> Build-Depends: debhelper (>= 9), quilt, m4, lsb-release, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, wdiff, tzdata, - xvfb, xauth, xfonts-base, libgl1-mesa-dri [!x32], xfwm4, x11-xkb-utils, dbus-x11, - jtreg, time, + xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, + jtreg <!nocheck>, time, fastjar (>= 2:0.96-0ubuntu2), autoconf (>= 2.69), automake, autotools-dev, ant, ant-optional, g++-8, === modified file 'debian/control.in' --- debian/control.in 2019-03-17 17:24:49 +0000 +++ debian/control.in 2019-03-28 07:25:41 +0000 @@ -5,8 +5,8 @@ Uploaders: Matthias Klose <[email protected]> Build-Depends: debhelper (>= 9), quilt, m4, lsb-release, zip, unzip, sharutils, gawk, cpio, pkg-config, procps, wdiff, tzdata, - xvfb, xauth, xfonts-base, libgl1-mesa-dri [!x32], xfwm4, x11-xkb-utils, dbus-x11, - jtreg, time, + xvfb <!nocheck>, xauth <!nocheck>, xfonts-base <!nocheck>, libgl1-mesa-dri [!x32] <!nocheck>, xfwm4 <!nocheck>, x11-xkb-utils <!nocheck>, dbus-x11 <!nocheck>, + jtreg <!nocheck>, time, @bd_fastjar@ @bd_autotools@ @bd_ant@ @bd_gcc@ === added file 'debian/patches/8193764.diff' --- debian/patches/8193764.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/8193764.diff 2019-03-28 07:25:41 +0000 @@ -0,0 +1,97 @@ + +# HG changeset patch +# User mr +# Date 1553099574 0 +# Node ID e0b7721459eec3a04ede8ffe21429c1b8bf14d26 +# Parent 5dd7e8d925e8a5927460c5ca978ecd05dea96d84 +8193764: Cannot set COMPANY_NAME when configuring a build +Reviewed-by: erikj, martin, tbell, aph + +diff -r 5dd7e8d925e8 -r e0b7721459ee common/autoconf/generated-configure.sh +--- a/common/autoconf/generated-configure.sh Mon Mar 18 08:33:19 2019 +0100 ++++ b/common/autoconf/generated-configure.sh Wed Mar 20 16:32:54 2019 +0000 +@@ -825,9 +825,9 @@ + COOKED_JDK_UPDATE_VERSION + JDK_VERSION + COPYRIGHT_YEAR ++COMPANY_NAME + MACOSX_BUNDLE_ID_BASE + MACOSX_BUNDLE_NAME_BASE +-COMPANY_NAME + JDK_RC_PLATFORM_NAME + PRODUCT_SUFFIX + PRODUCT_NAME +@@ -1057,6 +1057,7 @@ + with_update_version + with_user_release_suffix + with_build_number ++with_vendor_name + with_copyright_year + with_boot_jdk + with_boot_jdk_jvmargs +@@ -1890,6 +1891,7 @@ + Add a custom string to the version string if build + number isn't set.[username_builddateb00] + --with-build-number Set build number value for build [b00] ++ --with-vendor-name Set vendor name [not specified] + --with-copyright-year Set copyright year value for build [current year] + --with-boot-jdk path to Boot JDK (used to bootstrap build) [probed] + --with-boot-jdk-jvmargs specify JVM arguments to be passed to all +@@ -4358,7 +4360,7 @@ + #CUSTOM_AUTOCONF_INCLUDE + + # Do not change or remove the following line, it is needed for consistency checks: +-DATE_WHEN_GENERATED=1552344461 ++DATE_WHEN_GENERATED=1552671404 + + ############################################################################### + # +@@ -19871,6 +19873,21 @@ + + + ++ # The vendor name, if any ++ ++# Check whether --with-vendor-name was given. ++if test "${with_vendor_name+set}" = set; then : ++ withval=$with_vendor_name; ++fi ++ ++ if test "x$with_vendor_name" = xyes; then ++ as_fn_error $? "--with-vendor-name must have a value" "$LINENO" 5 ++ elif ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ; then ++ as_fn_error $? "--with--vendor-name contains non-printing characters: $with_vendor_name" "$LINENO" 5 ++ else ++ COMPANY_NAME="$with_vendor_name" ++ fi ++ + + + # Check whether --with-copyright-year was given. +diff -r 5dd7e8d925e8 -r e0b7721459ee common/autoconf/jdk-options.m4 +--- a/common/autoconf/jdk-options.m4 Mon Mar 18 08:33:19 2019 +0100 ++++ b/common/autoconf/jdk-options.m4 Wed Mar 20 16:32:54 2019 +0000 +@@ -509,10 +509,21 @@ + AC_SUBST(PRODUCT_NAME) + AC_SUBST(PRODUCT_SUFFIX) + AC_SUBST(JDK_RC_PLATFORM_NAME) +- AC_SUBST(COMPANY_NAME) + AC_SUBST(MACOSX_BUNDLE_NAME_BASE) + AC_SUBST(MACOSX_BUNDLE_ID_BASE) + ++ # The vendor name, if any ++ AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name], ++ [Set vendor name @<:@not specified@:>@])]) ++ if test "x$with_vendor_name" = xyes; then ++ AC_MSG_ERROR([--with-vendor-name must have a value]) ++ elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then ++ AC_MSG_ERROR([--with--vendor-name contains non-printing characters: $with_vendor_name]) ++ else ++ COMPANY_NAME="$with_vendor_name" ++ fi ++ AC_SUBST(COMPANY_NAME) ++ + AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year], + [Set copyright year value for build @<:@current year@:>@])]) + if test "x$with_copyright_year" = xyes; then + === modified file 'debian/rules' --- debian/rules 2019-03-18 21:38:41 +0000 +++ debian/rules 2019-03-28 07:25:41 +0000 @@ -357,6 +357,7 @@ jdk-i18n-pt_BR.diff \ jdk-java-nio-bits-unligned-aarch64.diff \ hotspot-ia64.diff \ + 8193764.diff \ # FIXME: # dont-strip-images.diff \ @@ -536,6 +537,24 @@ # --with-debug-level=fastdebug \ +ifeq ($(distribution),Debian) + COMMON_CONFIGURE_ARGS += \ + --with-vendor-name='$(distribution)' +else ifeq ($(distribution),Ubuntu) + v_pkgrel := $(shell echo $(PKGVERSION) | sed 's/^.*-//') + ppa_build := $(shell if echo 'v_pkgrel' | egrep '^[0-9]+(ubuntu[0-9]+)?(~[0-9.]+)?$$'; then echo no; else echo yes; fi) + ifeq ($(ppa_build),yes) + COMMON_CONFIGURE_ARGS += \ + --with-vendor-name='Private Build' + else + COMMON_CONFIGURE_ARGS += \ + --with-vendor-name='$(distribution)' + endif +else + COMMON_CONFIGURE_ARGS += \ + --with-vendor-name='$(distribution)' +endif + COMMON_CONFIGURE_ARGS += \ --with-debug-level=release \ --disable-debug-symbols \
__ This is the maintainer address of Debian's Java team <https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use [email protected] for discussions and questions.
