archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-18 22:54:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/java7-openjdk to 7.u21_2.3.9-4

Browse source
This commit is contained in:
Kevin Mihelich 2013-05-20 15:42:12 +00:00
parent e7174a9a99
commit 7fe94e6b93
3 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
extra/java7-openjdk/openjdk7_fix_jdk_cmds_path.diff → extra/java7-openjdk/01_fix_openjdk_cmds_path.diff
View file

@ -1,15 +1,18 @@
--- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2011-08-06 15:46:01.000000000 +0200
+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2011-08-06 15:59:26.000000000 +0200
@@ -91,7 +91,7 @@
--- openjdk/jdk/make/common/shared/Defs-utils.gmk.orig 2013-05-19 20:01:25.676093296 +0000
+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2013-05-19 20:01:54.312572109 +0000
@@ -98,9 +98,9 @@
CHMOD = $(UTILS_COMMAND_PATH)chmod
CMP = $(UTILS_USR_BIN_PATH)cmp
COMM = $(UTILS_USR_BIN_PATH)comm
-COMPRESS = $(UTILS_USR_BIN_PATH)compress
+COMPRESS = $(UTILS_COMMAND_PATH)compress
CP = $(UTILS_COMMAND_PATH)cp
CPIO = $(UTILS_COMMAND_PATH)cpio
-CPIO = $(UTILS_COMMAND_PATH)cpio
+CPIO = $(UTILS_USR_BIN_PATH)cpio
CUT = $(UTILS_USR_BIN_PATH)cut
@@ -101,13 +101,13 @@
DATE = $(UTILS_COMMAND_PATH)date
DF = $(UTILS_COMMAND_PATH)df
@@ -108,13 +108,13 @@
DIRNAME = $(UTILS_USR_BIN_PATH)dirname
DUMP = $(UTILS_CCS_BIN_PATH)dump
ECHO = $(UTILS_COMMAND_PATH)echo
@ -25,7 +28,7 @@
GUNZIP = $(UTILS_COMMAND_PATH)gunzip
# GZIP is used for solaris. Linux and windows use tar czf
GZIP = $(UTILS_COMMAND_PATH)gzip
@@ -140,7 +140,7 @@
@@ -148,7 +148,7 @@
TAIL = $(UTILS_USR_BIN_PATH)tail
TAR = $(UTILS_COMMAND_PATH)tar
TEST = $(UTILS_USR_BIN_PATH)test

17
extra/java7-openjdk/fix_corba_cmds_path.diff → extra/java7-openjdk/02_fix_corba_cmds_path.diff
View file

@ -1,15 +1,18 @@
--- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300
+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300
@@ -76,7 +76,7 @@
--- openjdk/corba/make/common/shared/Defs-utils.gmk.orig 2013-05-19 19:57:58.530784147 +0000
+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2013-05-19 19:58:44.777147938 +0000
@@ -83,9 +83,9 @@
CHMOD = $(UTILS_COMMAND_PATH)chmod
CMP = $(UTILS_USR_BIN_PATH)cmp
COMM = $(UTILS_USR_BIN_PATH)comm
-COMPRESS = $(UTILS_USR_BIN_PATH)compress
+COMPRESS = $(UTILS_COMMAND_PATH)compress
CP = $(UTILS_COMMAND_PATH)cp
CPIO = $(UTILS_COMMAND_PATH)cpio
-CPIO = $(UTILS_COMMAND_PATH)cpio
+CPIO = $(UTILS_USR_BIN_PATH)cpio
CUT = $(UTILS_USR_BIN_PATH)cut
@@ -125,7 +125,7 @@
DATE = $(UTILS_COMMAND_PATH)date
DF = $(UTILS_COMMAND_PATH)df
@@ -131,7 +131,7 @@
TAIL = $(UTILS_USR_BIN_PATH)tail
TAR = $(UTILS_COMMAND_PATH)tar
TEST = $(UTILS_USR_BIN_PATH)test
@ -18,10 +21,10 @@
TR = $(UTILS_USR_BIN_PATH)tr
TRUE = $(UTILS_COMMAND_PATH)true
UNAME = $(UTILS_COMMAND_PATH)uname
@@ -176,7 +176,7 @@
@@ -182,7 +182,7 @@
# others have it in /usr/bin.
SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
$(wildcard $(UTILS_USR_BIN_PATH)sort))
$(wildcard $(UTILS_USR_BIN_PATH)sort))
- NAWK = $(USRBIN_PATH)gawk
+ NAWK = $(UTILS_COMMAND_PATH)gawk
# Intrinsic unix command, with backslash-escaped character interpretation

18
extra/java7-openjdk/PKGBUILD
View file

@ -31,7 +31,7 @@ _HOTSPOT_CHANGESET=2c4981784101
_bootstrap=0 # 0/1 for quick build or full bootstrap
pkgver=${_java_ver}.${_updatever}_${_icedtea_ver}
pkgrel=3
pkgrel=4
arch=('i686' 'x86_64')
url="http://icedtea.classpath.org"
license=('custom')
@ -52,8 +52,8 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz # langtools.tar.gz
${_zurl}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz # hotspot.tar.gz
fontconfig-paths.diff
fix_corba_cmds_path.diff
openjdk7_fix_jdk_cmds_path.diff
01_fix_openjdk_cmds_path.diff
02_fix_corba_cmds_path.diff
openjdk7_nonreparenting-wm.diff
jdk7-openjdk.profile
jdk7-openjdk.profile.csh
@ -68,8 +68,8 @@ sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da'
'2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12'
'977617c76292f1de33b83daba80815a743159a9d050be2326ae41e20923e3a2b'
'9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
'7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea'
'583af9025df545264a15665e4c9f981bc7286aaecc6d312dced485102cf5dda9'
'd57754ff320475023688bd7c7af38a9ea37e27ed8c1edd3b1572e4d8b41b78d3'
'fd615f476ef17853ae55b7aee3c92b6738f9ea584e915749b1caa7fdc5ff9ca4'
'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
'3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
@ -101,7 +101,10 @@ build() {
. /etc/profile.d/apache-ant.sh
cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/openjdk7_fix_jdk_cmds_path.diff patches/openjdk7_nonreparenting-wm.diff"
export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
patches/01_fix_openjdk_cmds_path.diff \
patches/02_fix_corba_cmds_path.diff \
patches/openjdk7_nonreparenting-wm.diff"
if [ "$_bootstrap" = "1" ]; then
BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
@ -341,6 +344,9 @@ package_jdk7-openjdk() {
install -m755 -d ${pkgdir}/etc/profile.d/
install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
# Temporarily fixing FS#35141
chmod go+r ${pkgdir}/usr/lib/jvm/java-7-openjdk/lib/sa-jdi.jar
}
package_openjdk7-src() {