ref: 4c03d8d678c49d604ccc3f57f30ed25a7ba6d69e
parent: 632942f76110a55c987caaf43db9ccce1dca5aee
author: Mans Rullgard <mans@mansr.com>
date: Sat Aug 8 15:05:39 EDT 2020
build: remove obsolete hack for openmp support
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.62)
+LT_PREREQ(2.4)
AC_INIT(SoX, 14.4.3git, sox-devel@lists.sourceforge.net)
@@ -264,22 +265,6 @@
dnl Check for OpenMP
AC_OPENMP
-if test "x$OPENMP_CFLAGS" != "x"; then dnl Old libtool workaround start
- AC_MSG_CHECKING([for libtool version])
- lt_version="`grep '^VERSION' $srcdir/ltmain.sh | sed -e 's/VERSION\=//g;s/ .*//g;s/"//g'`"
- AS_VERSION_COMPARE([$lt_version], [2.4],
- [AS_IF([test "$GCC" = "yes"],
- [AC_MSG_RESULT([$lt_version, needs OpenMP linker workaround])
- GOMP_LIBS="-lgomp"],
- [AC_MSG_RESULT([$lt_version and not GCC, deactivating OpenMP])
- OPENMP_CFLAGS=""])],
- [AC_MSG_RESULT([$lt_version, OK])],
- [AC_MSG_RESULT([$lt_version, OK])])
-fi
-AC_SUBST(GOMP_LIBS) dnl Old libtool workaround end.
- dnl Only necessary if libtool version < 2.4, as older
- dnl versions don't pass on "-fopenmp" to the linker.
- dnl One day, replace with LT_PREREQ([2.4]) above.
CFLAGS="$CFLAGS $OPENMP_CFLAGS"
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -90,8 +90,6 @@
libsox_la_LIBADD += @MAGIC_LIBS@
endif
-libsox_la_LIBADD += @GOMP_LIBS@
-
libsox_la_CFLAGS = @WARN_CFLAGS@
libsox_la_LDFLAGS = @APP_LDFLAGS@ -version-info @SHLIB_VERSION@ \
-export-symbols-regex '^(sox_.*|lsx_(([cm]|re)alloc.*|check_read_params|(close|open)_dllibrary|(debug(_more|_most)?|fail|report|warn)_impl|eof|error|fail_errno|filelength|find_(enum_(text|value)|file_extension)|flush|getopt(_init)?|lpc10_(create_(de|en)coder_state|(de|en)code)|raw(read|write)|read(_b_buf|buf|chars)|rewind|seeki|sigfigs3p?|strcasecmp|strdup|tell|unreadb|write(b|_b_buf|buf|s)))$$'