build system: Fix shared libs generation
PATCH 1/1 build system: Fix shared libs generation
This fixes a regression of dbbd33f50d: There must be no AC_DISABLE_SHARED without AS_ENABLE_SHARED for the cases where it shall remain enabled. Autotools are great, aren't they?
--- configure.in | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
configure.in +10 -2
@@ -110,7 +110,6 @@ case "$build_for" in XENO_TARGET_ARCH=nios2 XENO_LINUX_ARCH=nios2 XENO_LINUX_INSTALL_TARGET=install - AC_DISABLE_SHARED ;; *) echo "" echo "*******************************************"
@@ -121,9 +120,18 @@ case "$build_for" in esac AC_MSG_RESULT([$XENO_TARGET_ARCH]) -AC_PROG_LIBTOOL AM_CONDITIONAL(XENO_LINUX_ARCH_I386,[test $XENO_LINUX_ARCH = i386]) +case "$XENO_TARGET_ARCH" in + nios2) + AC_DISABLE_SHARED + ;; + *) + AC_ENABLE_SHARED + ;; +esac +AC_PROG_LIBTOOL + dnl dnl Parse options dnl
Signature · 1 line
1.6.0.2
PATCH v2 1/1 build system: Fix shared libs generation
This fixes a regression of dbbd33f50d: There must be no AC_DISABLE_SHARED without AS_ENABLE_SHARED for the cases where it shall remain enabled.
--- configure.in | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)
v2: properly rebased against head
configure.in +10 -2
@@ -117,7 +117,6 @@ case "$build_for" in XENO_LINUX_ARCH=nios2 XENO_LINUX_INSTALL_TARGET=install CONFIG_XENO_DEFAULT_PERIOD=10000000 - AC_DISABLE_SHARED ;; *) echo "" echo "*******************************************"
@@ -128,9 +127,18 @@ case "$build_for" in esac AC_MSG_RESULT([$XENO_TARGET_ARCH]) -AC_PROG_LIBTOOL AM_CONDITIONAL(XENO_LINUX_ARCH_I386,[test $XENO_LINUX_ARCH = i386]) +case "$XENO_TARGET_ARCH" in + nios2) + AC_DISABLE_SHARED + ;; + *) + AC_ENABLE_SHARED + ;; +esac +AC_PROG_LIBTOOL + dnl dnl Parse options dnl
Signature · 1 line
1.6.0.2
Quoted 4 lines · Jan Kiszka
This fixes a regression of
dbbd33f50d: There must be noAC_DISABLE_SHAREDwithoutAS_ENABLE_SHAREDfor the cases where it shall remain enabled.
Makes sense. Will you queue this in your tree?
Quoted 39 lines
Signed-off-by Jan Kiszka <[email protected]>--- configure.in | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)v2: properly rebased against head
configure.in +10
-2@@ -117,7 +117,6 @@ case "$build_for" in XENO_LINUX_ARCH=nios2 XENO_LINUX_INSTALL_TARGET=install CONFIG_XENO_DEFAULT_PERIOD=10000000 - AC_DISABLE_SHARED ;; *) echo "" echo "*******************************************"@@ -128,9 +127,18 @@ case "$build_for" in esac AC_MSG_RESULT([$XENO_TARGET_ARCH]) -AC_PROG_LIBTOOL AM_CONDITIONAL(XENO_LINUX_ARCH_I386,[test $XENO_LINUX_ARCH = i386]) +case "$XENO_TARGET_ARCH" in + nios2) + AC_DISABLE_SHARED + ;; + *) + AC_ENABLE_SHARED + ;; +esac +AC_PROG_LIBTOOL + dnl dnl Parse options dnl
Signature · 1 line
Philippe.
Quoted 7 lines · Philippe Gerum
Quoted 4 lines · Jan Kiszka
This fixes a regression of
dbbd33f50d: There must be noAC_DISABLE_SHAREDwithoutAS_ENABLE_SHAREDfor the cases where it shall remain enabled.Makes sense. Will you queue this in your tree?
Done, it's ready to be pulled.
Jan
Quoted 42 lines
Quoted 40 lines
Signed-off-by Jan Kiszka <[email protected]>--- configure.in | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-)v2: properly rebased against head
configure.in +10
-2@@ -117,7 +117,6 @@ case "$build_for" in XENO_LINUX_ARCH=nios2 XENO_LINUX_INSTALL_TARGET=install CONFIG_XENO_DEFAULT_PERIOD=10000000 - AC_DISABLE_SHARED ;; *) echo "" echo "*******************************************"@@ -128,9 +127,18 @@ case "$build_for" in esac AC_MSG_RESULT([$XENO_TARGET_ARCH]) -AC_PROG_LIBTOOL AM_CONDITIONAL(XENO_LINUX_ARCH_I386,[test $XENO_LINUX_ARCH = i386]) +case "$XENO_TARGET_ARCH" in + nios2) + AC_DISABLE_SHARED + ;; + *) + AC_ENABLE_SHARED + ;; +esac +AC_PROG_LIBTOOL + dnl dnl Parse options dnl
Signature · 2 lines
Siemens AG, Corporate Technology, CT SE 2 Corporate Competence Center Embedded Linux