diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-06 18:32:40 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-07 01:34:42 +0100 |
| commit | 9487456637abc1f26eda26f9e38f260b5f49edc2 (patch) | |
| tree | d688d198d5019099c5111e3a888c631f1c3dd70f | |
| parent | 8c85ae050f7205e5cb8f56abb48ea88eb7a4eb7a (diff) | |
configure: add vars for Solaris/SPARC64 (already checked in vcl)
Change-Id: Ic27986d8d45f61facedf2400b77334aaf1da7c1e
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | external/hyphen/ExternalProject_hyphen.mk | 2 | ||||
| -rw-r--r-- | external/mythes/ExternalProject_mythes.mk | 2 | ||||
| -rw-r--r-- | odk/CustomTarget_check.mk | 16 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 2 |
5 files changed, 18 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 0a7b157b84fe..563d8991c2a1 100644 --- a/configure.ac +++ b/configure.ac @@ -4326,6 +4326,13 @@ solaris*) PLATFORMID=solaris_sparc OUTPATH=unxsogs ;; + sparc64) + CPU=U + CPUNAME=SPARC64 + RTL_ARCH=SPARC64 + PLATFORMID=solaris_sparc64 + OUTPATH=unxsogu + ;; *) AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os]) ;; diff --git a/external/hyphen/ExternalProject_hyphen.mk b/external/hyphen/ExternalProject_hyphen.mk index 573fbae00de0..6687265c2304 100644 --- a/external/hyphen/ExternalProject_hyphen.mk +++ b/external/hyphen/ExternalProject_hyphen.mk @@ -20,7 +20,7 @@ $(call gb_ExternalProject_get_state_target,hyphen,build): ./configure --disable-shared \ $(if $(filter-out IOS,$(OS)),--with-pic) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ - $(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \ + $(if $(filter C52-SPARC64,$(COM)-$(CPUNAME)),CFLAGS="-m64") \ && $(MAKE) \ ) diff --git a/external/mythes/ExternalProject_mythes.mk b/external/mythes/ExternalProject_mythes.mk index 8681cc292e12..88e2a616e9fb 100644 --- a/external/mythes/ExternalProject_mythes.mk +++ b/external/mythes/ExternalProject_mythes.mk @@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,mythes,build): $(call gb_ExternalProject_run,build,\ LIBS="$(gb_STDLIBS) $(LIBS)" ./configure --disable-shared --with-pic \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \ - $(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \ + $(if $(filter C52-SPARC64,$(COM)-$(CPUNAME)),CFLAGS="-m64") \ && $(MAKE) \ ) diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index bba54fbde03a..88af63aeac9b 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -16,14 +16,14 @@ $(eval $(call gb_CustomTarget_register_targets,odk/check,\ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ $(if $(filter GCC,$(COM)),mingw,windows),\ $(if $(filter SOLARIS,$(OS)),\ - $(if $(filter SPARC,$(CPUNAME)),solsparc,\ - $(if $(filter U,$(CPU)),solsparc64,solintel)),\ - $(if $(filter LINUX,$(OS)),linux,\ - $(if $(filter NETBSD,$(OS)),netbsd,\ - $(if $(filter FREEBSD,$(OS)),freebsd,\ - $(if $(filter DRAGONFLY,$(OS)),dragonfly,\ - $(if $(filter MACOSX,$(OS)),macosx,\ - $(if $(filter AIX,$(OS)),aix)))))))) + $(if $(filter SPARC,$(CPUNAME)),solsparc,\ + $(if $(filter SPARC64,$(CPUNAME)),solsparc64,solintel)),\ + $(if $(filter LINUX,$(OS)),linux,\ + $(if $(filter NETBSD,$(OS)),netbsd,\ + $(if $(filter FREEBSD,$(OS)),freebsd,\ + $(if $(filter DRAGONFLY,$(OS)),dragonfly,\ + $(if $(filter MACOSX,$(OS)),macosx,\ + $(if $(filter AIX,$(OS)),aix)))))))) $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 5dd3356a8b3a..fd245893b6b9 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -661,7 +661,7 @@ $(eval $(call gb_Library_add_libs,vcl,\ endif ifeq ($(OS),SOLARIS) -ifeq ($(CPUNAME)$(CPU),SPARCU) +ifeq ($(CPUNAME),SPARC64) $(eval $(call gb_Library_add_ldflags,vcl,\ -R/usr/sfw/lib/64 \ )) |