Mercurial > hg > release > visualvm-1.3
changeset 1:331abb57831c
Replace uname arch detection with use of AC_CANONICAL_HOST and sed.
2010-06-22 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(stamps/nbplatform.stamp): Don't run
uname, trying to guess the architecture.
The two scripts are nearly identical so just
fix them by replacing the broken 'gcc32' call
with $(CC) and -m64 with $(ARCHFLAG).
* acinclude.m4:
(VV_SET_ARCH_SETTINGS): Set ARCHFLAG according
to the host detected by configure.
* configure.ac:
Call VV_SET_ARCH_SETTINGS.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 23 Jun 2010 00:04:30 +0100 |
| parents | ceec3a6ce732 |
| children | 7562d9776311 |
| files | ChangeLog Makefile.am acinclude.m4 configure.ac |
| diffstat | 4 files changed, 53 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jun 22 23:07:25 2010 +0100 +++ b/ChangeLog Wed Jun 23 00:04:30 2010 +0100 @@ -1,3 +1,17 @@ +2010-06-22 Andrew John Hughes <ahughes@redhat.com> + + * Makefile.am: + (stamps/nbplatform.stamp): Don't run + uname, trying to guess the architecture. + The two scripts are nearly identical so just + fix them by replacing the broken 'gcc32' call + with $(CC) and -m64 with $(ARCHFLAG). + * acinclude.m4: + (VV_SET_ARCH_SETTINGS): Set ARCHFLAG according + to the host detected by configure. + * configure.ac: + Call VV_SET_ARCH_SETTINGS. + 2010-06-22 Andrew John Hughes <ahughes@redhat.com> * .hgignore,
--- a/Makefile.am Tue Jun 22 23:07:25 2010 +0100 +++ b/Makefile.am Wed Jun 23 00:04:30 2010 +0100 @@ -112,18 +112,13 @@ mkdir -p netbeans/nbbuild/netbeans_visualvm/ ln -s $(SYSTEM_NETBEANS_DIR)/$(NB_PLATFORM)/ netbeans/nbbuild/netbeans_visualvm ln -s $(SYSTEM_NETBEANS_DIR)/harness/ netbeans/nbbuild/netbeans_visualvm - if ! (uname -a | grep x86_64) ; then \ - mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk15/linux ; \ - mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk16/linux ; \ - buildscript=./buildnative-linux.sh ; \ - else \ - mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk15/linux-amd64 ; \ - mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk16/linux-amd64 ; \ - buildscript=./buildnative-linux64.sh ; \ - fi ; \ + mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk15/linux-amd64 + mkdir -p netbeans/lib.profiler/release/lib/deployed/jdk16/linux-amd64 + ln -s linux-amd64 netbeans/lib.profiler/release/lib/deployed/jdk15/linux + ln -s linux-amd64 netbeans/lib.profiler/release/lib/deployed/jdk16/linux cd netbeans/lib.profiler/native/build && \ - sed -ie 's#gcc32#$(CC)#' $$buildscript && \ - JAVA_HOME_15=$(SYSTEM_JDK_DIR) JAVA_HOME_16=$(SYSTEM_JDK_DIR) $$buildscript + sed -i -e 's#gcc32#$(CC)#' -e 's#-m64#$(ARCHFLAG)#' buildnative-linux64.sh && \ + JAVA_HOME_15=$(SYSTEM_JDK_DIR) JAVA_HOME_16=$(SYSTEM_JDK_DIR) ./buildnative-linux64.sh JAVA_HOME=$(SYSTEM_JDK_DIR) $(ANT) -Dpermit.jdk6.builds=true -f netbeans/nbbuild/build.xml bootstrap for dir in lib.profiler lib.profiler.charts lib.profiler.ui lib.profiler.common profiler ; do \ JAVA_HOME=$(SYSTEM_JDK_DIR) $(ANT) -Dpermit.jdk6.builds=true -Dbuildnumber=091221-4fc006d17cb1 \
--- a/acinclude.m4 Tue Jun 22 23:07:25 2010 +0100 +++ b/acinclude.m4 Wed Jun 23 00:04:30 2010 +0100 @@ -107,3 +107,35 @@ fi AC_SUBST([$1]) ]) + +AC_DEFUN([VV_SET_ARCH_SETTINGS], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + case "${host_cpu}" in + x86_64) + ARCHFLAG="-m64" + ;; + i?86) + ARCHFLAG="-m32" + ;; + powerpc) + ARCHFLAG="-m32" + ;; + powerpc64) + ARCHFLAG="-m64" + ;; + sparc) + ARCHFLAG="-m32" + ;; + sparc64) + ARCHFLAG="-m64" + ;; + s390) + ARCHFLAG="-m31" + ;; + s390x) + ARCHFLAG="-m64" + ;; + esac + AC_SUBST(ARCHFLAG) +])