diff options
| author | Rene Engelhard <rene@debian.org> | 2011-02-11 22:42:48 +0100 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2011-02-11 22:42:48 +0100 |
| commit | e5d74728e4e5311c6f432452a0987388a5d125c6 (patch) | |
| tree | 5d4f329aa77b858cbb4d2ffb5add7df1f934d6af /odk/settings | |
| parent | b1845548bb73578b2b571e00c85eedabbc251b05 (diff) | |
fix ODK settings.mk to only set STLPORTLIB if needed
Signed-off-by: Petr Mladek <pmladek@suse.cz>
Diffstat (limited to 'odk/settings')
| -rw-r--r-- | odk/settings/settings.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index 188ff880255e..3d67ee580c95 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -262,14 +262,12 @@ ifeq "$(PROCTYPE)" "powerpc" PACKAGE_LIB_DIR=linux_powerpc.plt UNOPKG_PLATFORM=Linux_PowerPC JAVA_PROC_TYPE=ppc -STLPORT=yes endif ifeq "$(PROCTYPE)" "sparc" PACKAGE_LIB_DIR=linux_sparc.plt UNOPKG_PLATFORM=Linux_SPARC JAVA_PROC_TYPE=sparc -STLPORT=yes endif ifeq "$(PROCTYPE)" "x86_64" @@ -503,9 +501,11 @@ PLATFORM=kfreebsd ifeq "$(PROCTYPE)" "x86_64" PACKAGE_LIB_DIR=kfreebsd_x86_64.plt UNOPKG_PLATFORM=kFreeBSD_x86_64 +STLPORT=no else PACKAGE_LIB_DIR=kfreebsd_x86.plt UNOPKG_PLATFORM=kFreeBSD_x86 +STLPORT=no endif else PLATFORM=freebsd @@ -569,11 +569,15 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID) SALHELPERLIB=-luno_salhelper$(COMID) REGLIB=-lreg STORELIB=-lstore +ifeq "$(STLPORT)" "yes" ifeq "$(STLPORT_VER)" "500" STLPORTLIB=-lstlport else STLPORTLIB=-lstlport_gcc$(STLDEBUG) endif +else +STLPORTLIB= +endif EMPTYSTRING= PATH_SEPARATOR=: |