Mercurial > hg > release > icedtea7-2.5
changeset 2712:efab00a8197a
PR1737: Support prefixed variants of GNU tools used on *BSD systems
2014-04-14 Andrew John Hughes <gnu.andrew@member.fsf.org>
* AUTHORS: Add Radim Kolar.
* acinclude.m4:
(IT_FIND_TOOL): Cleanup error message.
(IT_FIND_TOOLS): Likewise.
2014-03-20 Radim Kolar <hsn@sanatana.filez.com>
* Makefile.am:
(extract-openjdk): Use $(SED) instead of 'sed'.
(versioning): Likewise.
(add-systemtap): Likewise.
(add-systemtap-debug): Likewise.
(add-systemtap-boot): Likewise.
(rewrite-rhino): Likewise.
(clean-add-jamvm): Likewise.
(clean-add-jamvm-debug): Likewise.
(clean-add-cacao): Likewise.
(clean-add-cacao-debug): Likewise.
(clean-add-zero): Likewise.
(clean-add-zero-debug): Likewise.
(jtreg_processes): Likewise.
(rt): Likewise.
* acinclude.m4:
(IT_FIND_TOOLS): New macro to check for
multiple tools.
* configure.ac: Check for gmake, gfind, gpatch,
gsha256sum and gsed (GNU tools on *BSD).
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Thu, 17 Apr 2014 02:53:39 +0100 |
parents | f29672153a63 |
children | f164e91b0ca7 |
files | AUTHORS ChangeLog Makefile.am acinclude.m4 configure.ac |
diffstat | 5 files changed, 70 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Thu Jun 05 03:07:35 2014 +0100 +++ b/AUTHORS Thu Apr 17 02:53:39 2014 +0100 @@ -18,6 +18,7 @@ Andrew John Hughes <gnu_andrew@member.fsf.org, gnu.andrew@redhat.com> Tomas Hurka <tomas.hurka@sun.com> Ioana Ivan <iivan@redhat.com> +Radim Kolar <hsn@sanatana.filez.com> Matthias Klose <doko@ubuntu.com> Francis Kung <fkung@redhat.com> DJ Lucas <dj@linuxfromscratch.org>
--- a/ChangeLog Thu Jun 05 03:07:35 2014 +0100 +++ b/ChangeLog Thu Apr 17 02:53:39 2014 +0100 @@ -1,3 +1,33 @@ +2014-04-14 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * AUTHORS: Add Radim Kolar. + * acinclude.m4: + (IT_FIND_TOOL): Cleanup error message. + (IT_FIND_TOOLS): Likewise. + +2014-03-20 Radim Kolar <hsn@sanatana.filez.com> + + * Makefile.am: + (extract-openjdk): Use $(SED) instead of 'sed'. + (versioning): Likewise. + (add-systemtap): Likewise. + (add-systemtap-debug): Likewise. + (add-systemtap-boot): Likewise. + (rewrite-rhino): Likewise. + (clean-add-jamvm): Likewise. + (clean-add-jamvm-debug): Likewise. + (clean-add-cacao): Likewise. + (clean-add-cacao-debug): Likewise. + (clean-add-zero): Likewise. + (clean-add-zero-debug): Likewise. + (jtreg_processes): Likewise. + (rt): Likewise. + * acinclude.m4: + (IT_FIND_TOOLS): New macro to check for + multiple tools. + * configure.ac: Check for gmake, gfind, gpatch, + gsha256sum and gsed (GNU tools on *BSD). + 2014-05-09 Andrew John Hughes <gnu.andrew@member.fsf.org> PR1762: Undefined references when building with NSS 3.16.1
--- a/Makefile.am Thu Jun 05 03:07:35 2014 +0100 +++ b/Makefile.am Thu Apr 17 02:53:39 2014 +0100 @@ -1157,7 +1157,7 @@ *.zip) $(UNZIP) -q $(OPENJDK_SRC_ZIP) ;; \ *.tar.*) $(TAR) xf $(OPENJDK_SRC_ZIP) ;; \ esac; \ - mv `echo $(ICEDTEA_PREFIX)|sed 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \ + mv `echo $(ICEDTEA_PREFIX)|$(SED) 's#\.#-#'`-$(OPENJDK_CHANGESET) openjdk ; \ else \ echo "ERROR: Couldn't extract OpenJDK"; \ false; \ @@ -1502,7 +1502,7 @@ if test x"$(VERSION_SUFFIX)" != "x"; then \ ver_suffix="-$(VERSION_SUFFIX)"; \ fi ; \ - sed -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \ + $(SED) -i "s#BUILD_VARIANT_RELEASE)#BUILD_VARIANT_RELEASE)$${proj_suffix}$${ver_suffix}#" \ openjdk/jdk/make/common/shared/Defs.gmk; mkdir -p stamps touch $@ @@ -1734,13 +1734,13 @@ mkdir -p $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ if test $$? -eq 0; then \ - sed -e '/\/client\/libjvm.so/d' \ + $(SED) -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot.stp \ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ - sed -e '/\/client\/libjvm.so/d' \ + $(SED) -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot_jni.stp \ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \ - sed -e '/\/client\/libjvm.so/d' \ + $(SED) -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot_gc.stp \ > $(BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \ else \ @@ -1870,13 +1870,13 @@ mkdir -p $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ if test $$? -eq 0; then \ - sed -e '/\/client\/libjvm.so/d' \ + $(SED) -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot.stp \ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ - sed -e '/\/client\/libjvm.so/d' \ + $(SED) -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot_jni.stp \ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \ - sed -e '/\/client\/libjvm.so/d' \ + $(SED) -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot_gc.stp \ > $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \ else \ @@ -2007,13 +2007,13 @@ mkdir -p $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ if test $$? -eq 0; then \ - sed -e '/\/client\/libjvm.so/d' \ + $(SED) -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot.stp \ > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot.stp; \ - sed -e '/\/client\/libjvm.so/d' \ + $(SED) -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot_jni.stp \ > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_jni.stp; \ - sed -e '/\/client\/libjvm.so/d' \ + $(SED) -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot_gc.stp \ > $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset/hotspot_gc.stp; \ else \ @@ -2231,10 +2231,10 @@ org.mozilla sun.org.mozilla && \ (cd rhino/rhino.old && \ for files in `find -type f -not -name '*.class'` ; do \ - new_file=../rhino.new/`echo $$files|sed -e 's#org#sun/org#'` ; \ + new_file=../rhino.new/`echo $$files|$(SED) -e 's#org#sun/org#'` ; \ mkdir -p `dirname $$new_file` ; \ cp -v $$files $$new_file ; \ - sed -ie 's#org\.mozilla#sun.org.mozilla#g' $$new_file ; \ + $(SED) -ie 's#org\.mozilla#sun.org.mozilla#g' $$new_file ; \ done \ ) && \ (cd rhino/rhino.new && \ @@ -2290,7 +2290,7 @@ clean-add-jamvm: rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \ - sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ + $(SED) -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ fi rm -f stamps/add-jamvm.stamp @@ -2308,7 +2308,7 @@ clean-add-jamvm-debug: rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \ - sed -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ + $(SED) -i 's#-jamvm KNOWN#-jamvm ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ fi rm -f stamps/add-jamvm-debug.stamp @@ -2361,7 +2361,7 @@ clean-add-cacao: rm -rf $(BUILD_JRE_ARCH_DIR)/cacao if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \ - sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ + $(SED) -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ fi rm -f stamps/add-cacao.stamp @@ -2383,7 +2383,7 @@ clean-add-cacao-debug: rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/cacao if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \ - sed -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ + $(SED) -i 's#-cacao KNOWN#-cacao ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ fi rm -f stamps/add-cacao-debug.stamp @@ -2451,8 +2451,8 @@ rm -rf $(BUILD_JRE_ARCH_DIR)/shark rm -rf zerovm if [ -e $(BUILD_JRE_ARCH_DIR)/jvm.cfg ] ; then \ - sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ - sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ + $(SED) -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ + $(SED) -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_JRE_ARCH_DIR)/jvm.cfg ; \ fi rm -f stamps/add-zero.stamp @@ -2490,8 +2490,8 @@ rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/shark rm -rf zerovm if [ -e $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ] ; then \ - sed -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ - sed -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ + $(SED) -i 's#-zero KNOWN#-zero ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ + $(SED) -i 's#-shark KNOWN#-shark ERROR#' $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg ; \ fi rm -f stamps/add-zero-debug.stamp @@ -2569,7 +2569,7 @@ # FIXME: this might need some adjustment for other OS than Linux jtreg_processes = ps x -ww -o pid,ppid,args \ | awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,/scratch)/' \ - | sed 's,$(CURDIR)/$(sdkimg),<sdkimg>,g;s,$(CURDIR),<pwd>,g' + | $(SED) 's,$(CURDIR)/$(sdkimg),<sdkimg>,g;s,$(CURDIR),<pwd>,g' jtreg_pids = ps x --no-headers -ww -o pid,ppid,args \ | awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,$(CURDIR)/$(sdkimg))/ {print $$1}' @@ -2650,7 +2650,7 @@ cd lib/rt ; \ for dirs in $(ICEDTEA_BOOTSTRAP_RESOURCES) ; \ do \ - destpath=`echo $$dirs|sed -e 's#$(LANGTOOLS)/##' -e 's#$(SHARE)/##'` ; \ + destpath=`echo $$dirs|$(SED) -e 's#$(LANGTOOLS)/##' -e 's#$(SHARE)/##'` ; \ mkdir -p `dirname $$destpath` ; \ cp -a ../../$$dirs $$destpath ; \ done ; \
--- a/acinclude.m4 Thu Jun 05 03:07:35 2014 +0100 +++ b/acinclude.m4 Thu Apr 17 02:53:39 2014 +0100 @@ -661,7 +661,15 @@ AC_DEFUN([IT_FIND_TOOL], [AC_PATH_TOOL([$1],[$2]) if test x"$$1" = x ; then - AC_MSG_ERROR([$2 program not found in PATH]) + AC_MSG_ERROR([The following program was not found on the PATH: $2]) + fi + AC_SUBST([$1]) +]) + +AC_DEFUN([IT_FIND_TOOLS], +[AC_PATH_PROGS([$1],[$2]) + if test x"$$1" = x ; then + AC_MSG_ERROR([None of the following programs could be found on the PATH: $2]) fi AC_SUBST([$1]) ])
--- a/configure.ac Thu Jun 05 03:07:35 2014 +0100 +++ b/configure.ac Thu Apr 17 02:53:39 2014 +0100 @@ -18,24 +18,21 @@ AC_PROG_CC AC_PROG_CXX -IT_FIND_TOOL([MAKE], [make]) +IT_FIND_TOOLS([MAKE], [gmake make]) IT_FIND_TOOL([GZIP], [gzip]) IT_FIND_TOOL([ANT], [ant]) -IT_FIND_TOOL([FIND], [find]) -IT_FIND_TOOL([PATCH], [patch]) -IT_FIND_TOOL([TAR], [tar]) +IT_FIND_TOOLS([FIND], [gfind find]) +IT_FIND_TOOLS([PATCH], [gpatch patch]) +IT_FIND_TOOLS([TAR], [gtar tar]) IT_FIND_TOOL([CHMOD], [chmod]) -IT_FIND_TOOL([SHA256SUM], [sha256sum]) +IT_FIND_TOOLS([SHA256SUM], [gsha256sum sha256sum]) IT_FIND_TOOL([WGET], [wget]) IT_FIND_TOOL([ZIP], [zip]) IT_FIND_TOOL([UNZIP], [unzip]) IT_FIND_TOOL([CPIO], [cpio]) IT_FIND_TOOL([FILE], [file]) -AC_CHECK_TOOLS([FASTJAR], [fastjar jar]) -if test "x$FASTJAR" = x; then - AC_MSG_ERROR([Can't find fastjar or jar]) -fi -AC_SUBST([FASTJAR]) +IT_FIND_TOOLS([FASTJAR], [fastjar jar]) +IT_FIND_TOOLS([SED],[gsed sed]) AC_CHECK_TOOL([LDD], [ldd]) dnl OpenJDK's README-builds.html lists gawk as a build dependency so we dnl check for it explicitly rather than using AC_PROG_AWK.