[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#797665: openjdk-8: please allow derivatives to build as parent distros

Source: openjdk-8
Version: 8u45-b14
Severity: wishlist


  Please allow derivatives to build your package with same build runes as
  parent distribution.


-- System Information:
Debian Release: stretch/sid
  APT prefers unstable
  APT policy: (900, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 4.1.0-1-686-pae (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -u openjdk-8-8u45-b14/debian/rules openjdk-8-8u45-b14/debian/rules
--- openjdk-8-8u45-b14/debian/rules
+++ openjdk-8-8u45-b14/debian/rules
@@ -28,6 +28,9 @@
 distribution := $(shell lsb_release --id --short)
 distrel := $(shell lsb_release --codename --short)
+derivative := $(shell if dpkg-vendor --derives-from Ubuntu; then echo Ubuntu; \
+               elif dpkg-vendor --derives-from Debian; then echo Debian; \
+               else echo Unknown; fi)
 ifeq ($(distrel),n/a)
   distrel := sid
@@ -304,7 +307,7 @@
 ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf))
-ifeq ($(distribution),Ubuntu)
+ifeq ($(derivative),Ubuntu)
   OPT_CFLAGS/cppInterpreter_arm.o = -march=armv6 -mtune=cortex-a8 -O2 -falign-functions=64 -falign-loops=8 -g0
   OPT_CFLAGS/cppInterpreter_arm.o = -O2 -falign-functions=32 -falign-loops=8 -g0
@@ -331,7 +334,7 @@
 on_buildd := $(shell [ -f /CurrentlyBuilding -o "$$LOGNAME" = buildd ] && echo yes)
-ifeq ($(distribution),Debian)
+ifeq ($(derivative),Debian)
   with_wm = $(notdir $(firstword $(wildcard /usr/bin/metacity /usr/bin/twm)))
   ifneq (,$(findstring twm, $(with_wm)))
     with_wm_args = -f $(CURDIR)/bin/jtreg.tmwrc
@@ -804,7 +807,7 @@
 # .desktop files need to be multiarch installable
 java_launcher = /$(basedir)/bin/java
 java_launcher = /usr/bin/java
-ifeq ($(distribution),Ubuntu)
+ifeq ($(derivative),Ubuntu)
   java_launcher = cautious-launcher %f /$(basedir)/bin/java
   java_launcher = cautious-launcher %f /usr/bin/java
@@ -1616,7 +1619,7 @@
 	rm -f debian/*.install debian/*.links debian/*.debhelper.log
 lib_ext_dirs = common $(sort $(foreach arch,$(arch_map),$(firstword $(subst =,$(SPACE),$(arch)))))
-ifeq ($(distribution),Ubuntu)
+ifeq ($(derivative),Ubuntu)
   lib_ext_dirs := $(filter-out arm hppa m68k mips% powerpcspe s390% sh%, $(lib_ext_dirs))
   lib_ext_dirs := $(filter-out arm hppa lpia, $(lib_ext_dirs))

Reply to: