Attachment 3902 Details for Bug 21629 – BALL-1.3.0-alt-shared.patch

[patch] BALL-1.3.0-alt-shared.patch

BALL-1.3.0-alt-shared.patch (text/plain), 5.76 KB, created by Michael Shigorin on 2009-09-19 19:56:43 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Shigorin

Created: 2009-09-19 19:56:43 MSD

Size: 5.76 KB

patch

obsolete

>diff -Naur BALL-1.3.0-orig/source/config/m4/fftw.m4 BALL-1.3.0/source/config/m4/fftw.m4
>--- BALL-1.3.0-orig/source/config/m4/fftw.m4	2009-09-17 21:50:39 +0000
>+++ BALL-1.3.0/source/config/m4/fftw.m4	2009-09-19 08:52:23 +0000
>@@ -86,7 +86,7 @@
> 		AC_MSG_CHECKING(linking against libfftw3f)
> 		SAVE_LIBS=${LIBS}
> 		SAVE_LDFLAGS=${LDFLAGS}
>-		LIBS="${FFTW_LIB_F}/libfftw3f.a ${LIBS}"
>+		LIBS="-lfftw3f ${LIBS}"
> 		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
> 		FFTW_LINKING_OK=0
> 		AC_TRY_LINK([
>@@ -114,7 +114,7 @@
> 		AC_MSG_CHECKING(linking against libfftw3)
> 		SAVE_LIBS=${LIBS}
> 		SAVE_LDFLAGS=${LDFLAGS}
>-		LIBS="${FFTW_LIB_D}/libfftw3.a ${LIBS}"
>+		LIBS="-lfftw3 ${LIBS}"
> 		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
> 		FFTW_LINKING_OK=0
> 		AC_TRY_LINK([
>@@ -142,7 +142,7 @@
> 		AC_MSG_CHECKING(linking against libfftw3l)
> 		SAVE_LIBS=${LIBS}
> 		SAVE_LDFLAGS=${LDFLAGS}
>-		LIBS="${FFTW_LIB_D}/libfftw3l.a ${LIBS}"
>+		LIBS="-lfftw3l ${LIBS}"
> 		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
> 		FFTW_LINKING_OK=0
> 		AC_TRY_LINK([
>@@ -167,15 +167,15 @@
> 
> 	AC_DEFINE_UNQUOTED(PROJECT[]_COMPLEX_TYPE, ${PROJECT[]_COMPLEX_TYPE})
> 	if test "${PROJECT[]_HAS_FFTW_FLOAT}" != "" ; then
>-		FFTW_LIBS="${FFTW_LIB_F}/libfftw3f.a"
>+		FFTW_LIBS="-lfftw3f"
> 		AC_DEFINE(PROJECT[]_HAS_FFTW_FLOAT,)
> 	fi
> 	if test "${PROJECT[]_HAS_FFTW_DOUBLE}" != "" ; then
>-		FFTW_LIBS="$FFTW_LIBS ${FFTW_LIB_D}/libfftw3.a"
>+		FFTW_LIBS="$FFTW_LIBS -lfftw3"
> 		AC_DEFINE(PROJECT[]_HAS_FFTW_DOUBLE,)
> 	fi
> 	if test "${PROJECT[]_HAS_FFTW_LONG_DOUBLE}" != "" ; then
>-		FFTW_LIBS="$FFTW_LIBS ${FFTW_LIB_L}/libfftw3l.a"
>+		FFTW_LIBS="$FFTW_LIBS -lfftw3l"
> 		AC_DEFINE(PROJECT[]_HAS_FFTW_LONG_DOUBLE,)
> 	fi
> 		if test "${PROJECT[]_HAS_FFTW_H}" != "" ; then
>diff -Naur BALL-1.3.0-orig/source/config/m4/gsl.m4 BALL-1.3.0/source/config/m4/gsl.m4
>--- BALL-1.3.0-orig/source/config/m4/gsl.m4	2009-09-17 21:50:39 +0000
>+++ BALL-1.3.0/source/config/m4/gsl.m4	2009-09-19 09:03:11 +0000
>@@ -64,8 +64,8 @@
> 	else
> 		AC_MSG_CHECKING(for libgslcblas)
> 		if test "${GSL_LIBDIR}" != "" ; then
>-			if test -a "${GSL_LIBDIR}/libgslcblas.a" ; then
>-				AC_MSG_RESULT(${GSL_LIBDIR}/libgslcblas.a)
>+			if test -a "${GSL_LIBDIR}/libgslcblas.${SHARED_LIB_SUFFIX}" ; then
>+				AC_MSG_RESULT(${GSL_LIBDIR}/libgslcblas.${SHARED_LIB_SUFFIX})
> 			else
> 				AC_MSG_RESULT((not found!))
> 				AC_MSG_RESULT()
>diff -Naur BALL-1.3.0-orig/source/configure BALL-1.3.0/source/configure
>--- BALL-1.3.0-orig/source/configure	2009-09-17 21:50:39 +0000
>+++ BALL-1.3.0/source/configure	2009-09-19 10:03:21 +0000
>@@ -19103,7 +19103,7 @@
> $as_echo_n "checking linking against libfftw3f... " >&6; }
> 		SAVE_LIBS=${LIBS}
> 		SAVE_LDFLAGS=${LDFLAGS}
>-		LIBS="${FFTW_LIB_F}/libfftw3f.a ${LIBS}"
>+		LIBS="-lfftw3f ${LIBS}"
> 		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
> 		FFTW_LINKING_OK=0
> 		cat >conftest.$ac_ext <<_ACEOF
>@@ -19217,7 +19217,7 @@
> $as_echo_n "checking linking against libfftw3... " >&6; }
> 		SAVE_LIBS=${LIBS}
> 		SAVE_LDFLAGS=${LDFLAGS}
>-		LIBS="${FFTW_LIB_D}/libfftw3.a ${LIBS}"
>+		LIBS="-lfftw3 ${LIBS}"
> 		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
> 		FFTW_LINKING_OK=0
> 		cat >conftest.$ac_ext <<_ACEOF
>@@ -19331,7 +19331,7 @@
> $as_echo_n "checking linking against libfftw3l... " >&6; }
> 		SAVE_LIBS=${LIBS}
> 		SAVE_LDFLAGS=${LDFLAGS}
>-		LIBS="${FFTW_LIB_D}/libfftw3l.a ${LIBS}"
>+		LIBS="-lfftw3l ${LIBS}"
> 		LDFLAGS="$LDFLAGS -I${FFTW_INCL_PATH}"
> 		FFTW_LINKING_OK=0
> 		cat >conftest.$ac_ext <<_ACEOF
>@@ -19444,21 +19444,21 @@
> _ACEOF
> 
> 	if test "${BALL_HAS_FFTW_FLOAT}" != "" ; then
>-		FFTW_LIBS="${FFTW_LIB_F}/libfftw3f.a"
>+		FFTW_LIBS="-lfftw3f"
> 		cat >>confdefs.h <<\_ACEOF
> #define BALL_HAS_FFTW_FLOAT /**/
> _ACEOF
> 
> 	fi
> 	if test "${BALL_HAS_FFTW_DOUBLE}" != "" ; then
>-		FFTW_LIBS="$FFTW_LIBS ${FFTW_LIB_D}/libfftw3.a"
>+		FFTW_LIBS="$FFTW_LIBS -lfftw3"
> 		cat >>confdefs.h <<\_ACEOF
> #define BALL_HAS_FFTW_DOUBLE /**/
> _ACEOF
> 
> 	fi
> 	if test "${BALL_HAS_FFTW_LONG_DOUBLE}" != "" ; then
>-		FFTW_LIBS="$FFTW_LIBS ${FFTW_LIB_L}/libfftw3l.a"
>+		FFTW_LIBS="$FFTW_LIBS -lfftw3l"
> 		cat >>confdefs.h <<\_ACEOF
> #define BALL_HAS_FFTW_LONG_DOUBLE /**/
> _ACEOF
>@@ -19964,9 +19964,9 @@
> 		{ $as_echo "$as_me:$LINENO: checking for libgslcblas" >&5
> $as_echo_n "checking for libgslcblas... " >&6; }
> 		if test "${GSL_LIBDIR}" != "" ; then
>-			if test -a "${GSL_LIBDIR}/libgslcblas.a" ; then
>-				{ $as_echo "$as_me:$LINENO: result: ${GSL_LIBDIR}/libgslcblas.a" >&5
>-$as_echo "${GSL_LIBDIR}/libgslcblas.a" >&6; }
>+			if test -a "${GSL_LIBDIR}/libgslcblas.${SHARED_LIB_SUFFIX}" ; then
>+				{ $as_echo "$as_me:$LINENO: result: ${GSL_LIBDIR}/libgslcblas.${SHARED_LIB_SUFFIX}" >&5
>+$as_echo "${GSL_LIBDIR}/libgslcblas.${SHARED_LIB_SUFFIX}" >&6; }
> 			else
> 				{ $as_echo "$as_me:$LINENO: result: (not found!)" >&5
> $as_echo "(not found!)" >&6; }
>@@ -39338,7 +39338,7 @@
> 
> if test "${USE_LIBTOOL}" = "true" ; then
> 	LINKER="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR}"
>-	DYNAR="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR} --shared -export-dynamic -release ${BALL_VERSION_STRING} -rpath ${LIBTOOL_RPATH}/${LIBDIR}"
>+	DYNAR="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR} --shared -export-dynamic -release ${BALL_VERSION_STRING}"
> 	SHARED_LIB_SUFFIX=la
> 
> else
>diff -Naur BALL-1.3.0-orig/source/configure.ac BALL-1.3.0/source/configure.ac
>--- BALL-1.3.0-orig/source/configure.ac	2009-09-17 21:50:39 +0000
>+++ BALL-1.3.0/source/configure.ac	2009-09-19 10:03:30 +0000
>@@ -835,7 +835,7 @@
> dnl
> if test "${USE_LIBTOOL}" = "true" ; then
> 	LINKER="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR}"
>-	DYNAR="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR} --shared -export-dynamic -release ${BALL_VERSION_STRING} -rpath ${LIBTOOL_RPATH}/${LIBDIR}"
>+	DYNAR="${BALL_PATH}/source/libtool --tag=CXX --mode=link ${DYNAR} --shared -export-dynamic -release ${BALL_VERSION_STRING}"
> 	SHARED_LIB_SUFFIX=la
> 	AC_SUBST(SHARED_LIB_SUFFIX)
> else

Actions: View | Diff

Attachments on bug 21629: 3901 | 3902 | 3903