Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:wolfi323:branches:KDE:Frameworks5
julius
julius-4.4.2.1-fix-the-broken-build-system.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File julius-4.4.2.1-fix-the-broken-build-system.patch of Package julius
commit 66eea0cfcf2dd79f6a7d98e300de03541d10fb5c Author: Christophe Giboudeaux <christophe@krop.fr> Date: Thu May 31 13:06:56 2018 +0200 Fix the broken build system. The linker errors are solved using : perl -p -i -e "s#libjulius-config --libs#libjulius-config --libs \| sed -e 's,-ljulius,\\\$\(LIBJULIUS\)/libjulius.so.0.0.0,g'#g" **/Makefile perl -p -i -e "s#libjulius-config --libs#libjulius-config --libs \| sed -e 's,-ljulius,\\\$\(LIBJULIUS\)/libjulius.so.0.0.0,g'#g" **/Makefile.in perl -p -i -e "s#libsent-config --libs#libsent-config --libs \| sed -e 's,-lsent,\\\$\(LIBSENT\)/libsent.so.0.0.0,g'#g" **/Makefile perl -p -i -e "s#libsent-config --libs#libsent-config --libs \| sed -e 's,-lsent,\\\$\(LIBSENT\)/libsent.so.0.0.0,g'#g" **/Makefile.in diff --git a/adinrec/Makefile.in b/adinrec/Makefile.in index 4c03cc4..5f077de 100644 --- a/adinrec/Makefile.in +++ b/adinrec/Makefile.in @@ -16,7 +16,7 @@ LIBJULIUS=../libjulius CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=-I. -I$(LIBJULIUS)/include -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags` -LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs | sed -e 's,-ljulius,$(LIBJULIUS)/libjulius.so.0.0.0,g'` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/adintool/Makefile.in b/adintool/Makefile.in index 6539164..c2b58f7 100644 --- a/adintool/Makefile.in +++ b/adintool/Makefile.in @@ -16,7 +16,7 @@ LIBJULIUS=../libjulius CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=-I. -I$(LIBJULIUS)/include -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags` -LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs | sed -e 's,-ljulius,$(LIBJULIUS)/libjulius.so.0.0.0,g'` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/binlm2arpa/Makefile.in b/binlm2arpa/Makefile.in index 069801e..39f256b 100644 --- a/binlm2arpa/Makefile.in +++ b/binlm2arpa/Makefile.in @@ -13,7 +13,7 @@ LIBSENT=../libsent CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=-I$(LIBSENT)/include @CPPFLAGS@ @DEFS@ `$(LIBSENT)/libsent-config --cflags` -LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/configure.in b/configure.in index 2b80a25..74fcd92 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl All rights reserved dnl AC_INIT(Sample.jconf) AC_CONFIG_AUX_DIR(support) -AC_CONFIG_SUBDIRS(adintool mkgshmm gramtools jcontrol mkbingram julius libjulius libsent) +AC_CONFIG_SUBDIRS(adintool mkgshmm gramtools jcontrol mkbingram libsent libjulius julius) dnl all configure options will be passed to all subdirectries. diff --git a/generate-ngram/Makefile.in b/generate-ngram/Makefile.in index f79378d..658a263 100644 --- a/generate-ngram/Makefile.in +++ b/generate-ngram/Makefile.in @@ -15,7 +15,7 @@ LIBSENT=../libsent CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=-I$(LIBSENT)/include @CPPFLAGS@ @DEFS@ `$(LIBSENT)/libsent-config --cflags` -LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/gramtools/accept_check/Makefile.in b/gramtools/accept_check/Makefile.in index 897b025..0d585a6 100644 --- a/gramtools/accept_check/Makefile.in +++ b/gramtools/accept_check/Makefile.in @@ -13,7 +13,7 @@ LIBSENT=../../libsent CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ @DEFS@ -I$(LIBSENT)/include `$(LIBSENT)/libsent-config --cflags` -LDFLAGS=@LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ diff --git a/gramtools/dfa_determinize/Makefile.in b/gramtools/dfa_determinize/Makefile.in index aaa03d0..cc33835 100644 --- a/gramtools/dfa_determinize/Makefile.in +++ b/gramtools/dfa_determinize/Makefile.in @@ -13,7 +13,7 @@ LIBSENT=../../libsent CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ @DEFS@ -I$(LIBSENT)/include `$(LIBSENT)/libsent-config --cflags` -LDFLAGS=@LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/gramtools/dfa_minimize/Makefile.in b/gramtools/dfa_minimize/Makefile.in index c2cb0a3..ad058c3 100644 --- a/gramtools/dfa_minimize/Makefile.in +++ b/gramtools/dfa_minimize/Makefile.in @@ -13,7 +13,7 @@ LIBSENT=../../libsent CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ @DEFS@ -I$(LIBSENT)/include `$(LIBSENT)/libsent-config --cflags` -LDFLAGS=@LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/gramtools/generate/Makefile.in b/gramtools/generate/Makefile.in index fc5832b..7e1692f 100644 --- a/gramtools/generate/Makefile.in +++ b/gramtools/generate/Makefile.in @@ -13,7 +13,7 @@ LIBSENT=../../libsent CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ @DEFS@ -I$(LIBSENT)/include `$(LIBSENT)/libsent-config --cflags` -LDFLAGS=@LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/gramtools/nextword/Makefile.in b/gramtools/nextword/Makefile.in index 3772370..11663bf 100644 --- a/gramtools/nextword/Makefile.in +++ b/gramtools/nextword/Makefile.in @@ -14,7 +14,7 @@ LIBSENT=../../libsent CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=@CPPFLAGS@ @DEFS@ -I$(LIBSENT)/include `$(LIBSENT)/libsent-config --cflags` -LDFLAGS=@LDFLAGS@ @LIBS@ @READLINE_LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ @LIBS@ @READLINE_LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/jclient-perl/jclient.pl b/jclient-perl/jclient.pl old mode 100644 new mode 100755 diff --git a/jcontrol/configure b/jcontrol/configure index 0ca44db..2804771 100755 --- a/jcontrol/configure +++ b/jcontrol/configure @@ -380,15 +380,6 @@ EOF ;; *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - esac done diff --git a/julius-simple/Makefile b/julius-simple/Makefile index f7568df..0caf730 100644 --- a/julius-simple/Makefile +++ b/julius-simple/Makefile @@ -8,13 +8,13 @@ CFLAGS=-g -O2 #### When using system-installed libraries #### # CPPFLAGS=`libjulius-config --cflags` `libsent-config --cflags` -# LDFLAGS=`libjulius-config --libs` `libsent-config --libs` +# LDFLAGS=`libjulius-config --libs | sed -e 's,-ljulius,$(LIBJULIUS)/libjulius.so.0.0.0,g'` `libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` #### #### When using within-package libraries #### CPPFLAGS=-I$(LIBJULIUS)/include -I$(LIBSENT)/include `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags` -LDFLAGS= -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS= -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs | sed -e 's,-ljulius,$(LIBJULIUS)/libjulius.so.0.0.0,g'` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` ############################################################ diff --git a/julius/Makefile.in b/julius/Makefile.in index 9c1add9..39c6904 100644 --- a/julius/Makefile.in +++ b/julius/Makefile.in @@ -18,7 +18,7 @@ LIBJULIUS=../libjulius CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=-I. -I$(LIBJULIUS)/include -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags` -LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` @LIBICONV@ +LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs | sed -e 's,-ljulius,$(LIBJULIUS)/libjulius.so.0.0.0,g'` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` @LIBICONV@ GTK_CFLAGS=@GTK_CFLAGS@ GTK_LIBS=@GTK_LIBS@ RM=@RM@ -f diff --git a/libjulius/Makefile.in b/libjulius/Makefile.in index 51d2fbe..8c585dc 100644 --- a/libjulius/Makefile.in +++ b/libjulius/Makefile.in @@ -17,7 +17,7 @@ LIBSENT=../libsent CC=@CC@ CFLAGS=-fPIC @CFLAGS@ CPPFLAGS=-fPIC -Iinclude -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` -LDFLAGS=-shared -Wl,soname,$(SONAME) @LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=-shared -Wl,-soname,${SONAME} @LDFLAGS@ @LIBS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f AR=@AR@ r RANLIB=@RANLIB@ @@ -35,7 +35,7 @@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ ############################################################ -PKGCONF_FILE = julius-@JULIUS_MAJOR_VERSION@.pc +PKGCONF_FILE = julius.pc OBJ = \ src/recogmain.o \ @@ -92,9 +92,10 @@ install: install.lib install.include install.bin install.lib: $(TARGET) ${INSTALL} -d ${DESTDIR}${libdir} ${INSTALL_DATA} $(TARGET) ${DESTDIR}${libdir} - ${INSTALL_DATA} $(PKGCONF_FILE) ${DESTDIR}${pkgconfigdir} ln -rs ${DESTDIR}${libdir}/libjulius.so.0.0.0 ${DESTDIR}${libdir}/libjulius.so.0 ln -rs ${DESTDIR}${libdir}/libjulius.so.0.0.0 ${DESTDIR}${libdir}/libjulius.so + ${INSTALL} -d ${DESTDIR}${pkgconfigdir} + ${INSTALL_DATA} $(PKGCONF_FILE) ${DESTDIR}${pkgconfigdir} install.include: ${INSTALL} -d ${DESTDIR}${includedir}/julius diff --git a/libjulius/configure b/libjulius/configure index e66ec25..947eaa9 100755 --- a/libjulius/configure +++ b/libjulius/configure @@ -4165,7 +4165,7 @@ _ACEOF ac_config_commands="$ac_config_commands default-1" -ac_config_files="$ac_config_files Makefile libjulius-config libjulius-config-dist julius-$JULIUS_MAJOR_VERSION.pc:julius.pc.in doxygen.conf.ver" +ac_config_files="$ac_config_files Makefile libjulius-config libjulius-config-dist julius.pc:julius.pc.in doxygen.conf.ver" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -4871,7 +4871,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "libjulius-config") CONFIG_FILES="$CONFIG_FILES libjulius-config" ;; "libjulius-config-dist") CONFIG_FILES="$CONFIG_FILES libjulius-config-dist" ;; - "julius-$JULIUS_MAJOR_VERSION.pc") CONFIG_FILES="$CONFIG_FILES julius-$JULIUS_MAJOR_VERSION.pc:julius.pc.in" ;; + "julius.pc") CONFIG_FILES="$CONFIG_FILES julius.pc:julius.pc.in" ;; "doxygen.conf.ver") CONFIG_FILES="$CONFIG_FILES doxygen.conf.ver" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; diff --git a/libjulius/configure.in b/libjulius/configure.in index 2698d3d..0e4d8e7 100644 --- a/libjulius/configure.in +++ b/libjulius/configure.in @@ -397,4 +397,4 @@ AC_SUBST(easy_setup) AC_OUTPUT_COMMANDS( [chmod +x libjulius-config libjulius-config-dist ]) -AC_OUTPUT(Makefile libjulius-config libjulius-config-dist julius-$JULIUS_MAJOR_VERSION.pc:julius.pc.in doxygen.conf.ver) +AC_OUTPUT(Makefile libjulius-config libjulius-config-dist julius.pc:julius.pc.in doxygen.conf.ver) diff --git a/libjulius/julius.pc.in b/libjulius/julius.pc.in index f32ed7a..40723f1 100644 --- a/libjulius/julius.pc.in +++ b/libjulius/julius.pc.in @@ -8,4 +8,4 @@ Description: @JULIUS_PRODUCTNAME@ is the C library for Julius speech recognition Version: @JULIUS_VERSION@ Libs: -ljulius @LDFLAGS@ @LIBS@ Cflags: -I@includedir@ @CPPFLAGS@ -Depends: sent-4 +Depends: sent diff --git a/libsent/Makefile.in b/libsent/Makefile.in index 40e41a5..70d4a40 100644 --- a/libsent/Makefile.in +++ b/libsent/Makefile.in @@ -17,11 +17,11 @@ SONAME=libsent.so.0 CC=@CC@ CFLAGS=-fPIC @CFLAGS@ CPPFLAGS=-fPIC -Iinclude @CPPFLAGS@ @SOUNDINC@ @DEFS@ -LDFLAGS=-shared -Wl,soname,$(SONAME) +LDFLAGS=-shared -Wl,-soname,${SONAME} RM=@RM@ -f AR=@AR@ r RANLIB=@RANLIB@ -PKGCONF_FILE = sent-@LIBSENT_MAJOR_VERSION@.pc +PKGCONF_FILE = sent.pc ## install prefix=@prefix@ @@ -171,9 +171,10 @@ install: install.lib install.include install.bin install.lib: $(TARGET) ${INSTALL} -d ${DESTDIR}${libdir} ${INSTALL_DATA} $(TARGET) ${DESTDIR}${libdir} - ${INSTALL_DATA} $(PKGCONF_FILE) ${DESTDIR}${pkgconfigdir} ln -rs ${DESTDIR}${libdir}/libsent.so.0.0.0 ${DESTDIR}${libdir}/libsent.so.0 ln -rs ${DESTDIR}${libdir}/libsent.so.0.0.0 ${DESTDIR}${libdir}/libsent.so + ${INSTALL} -d ${DESTDIR}${pkgconfigdir} + ${INSTALL_DATA} $(PKGCONF_FILE) ${DESTDIR}${pkgconfigdir} install.include: ${INSTALL} -d ${DESTDIR}${includedir}/sent diff --git a/libsent/configure b/libsent/configure index bebbcbf..2fb859c 100755 --- a/libsent/configure +++ b/libsent/configure @@ -5715,7 +5715,7 @@ _ACEOF ac_config_commands="$ac_config_commands default-1" -ac_config_files="$ac_config_files Makefile libsent-config libsent-config-dist sent-$LIBSENT_MAJOR_VERSION.pc:sent.pc.in" +ac_config_files="$ac_config_files Makefile libsent-config libsent-config-dist sent.pc:sent.pc.in" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -6429,7 +6429,7 @@ do "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "libsent-config") CONFIG_FILES="$CONFIG_FILES libsent-config" ;; "libsent-config-dist") CONFIG_FILES="$CONFIG_FILES libsent-config-dist" ;; - "sent-$LIBSENT_MAJOR_VERSION.pc") CONFIG_FILES="$CONFIG_FILES sent-$LIBSENT_MAJOR_VERSION.pc:sent.pc.in" ;; + "sent.pc") CONFIG_FILES="$CONFIG_FILES sent.pc:sent.pc.in" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/libsent/configure.in b/libsent/configure.in index 2188cfc..06b2b13 100644 --- a/libsent/configure.in +++ b/libsent/configure.in @@ -821,4 +821,4 @@ use_pthread=$use_pthread wavefile_support="$wavefile_support" gzdesc="$gzdesc" ) -AC_OUTPUT(Makefile libsent-config libsent-config-dist sent-$LIBSENT_MAJOR_VERSION.pc:sent.pc.in) +AC_OUTPUT(Makefile libsent-config libsent-config-dist sent.pc:sent.pc.in) diff --git a/mkbingram/Makefile.in b/mkbingram/Makefile.in index 5960e4f..cbda164 100644 --- a/mkbingram/Makefile.in +++ b/mkbingram/Makefile.in @@ -13,7 +13,7 @@ LIBSENT=../libsent CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=-I$(LIBSENT)/include @CPPFLAGS@ @DEFS@ `$(LIBSENT)/libsent-config --cflags` -LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` @LIBICONV@ +LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` @LIBICONV@ RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/mkbinhmm/Makefile.in b/mkbinhmm/Makefile.in index 7c0228f..8a87539 100644 --- a/mkbinhmm/Makefile.in +++ b/mkbinhmm/Makefile.in @@ -15,7 +15,7 @@ LIBSENT=../libsent CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=-I$(LIBSENT)/include @CPPFLAGS@ @DEFS@ `$(LIBSENT)/libsent-config --cflags` -LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/mkgshmm/configure b/mkgshmm/configure index dc60925..c5093be 100755 --- a/mkgshmm/configure +++ b/mkgshmm/configure @@ -380,15 +380,6 @@ EOF ;; *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - esac done diff --git a/mkss/Makefile.in b/mkss/Makefile.in index a612236..cd082b8 100644 --- a/mkss/Makefile.in +++ b/mkss/Makefile.in @@ -16,7 +16,7 @@ LIBJULIUS=../libjulius CC=@CC@ CFLAGS=@CFLAGS@ CPPFLAGS=-I. -I$(LIBJULIUS)/include -I$(LIBSENT)/include @CPPFLAGS@ `$(LIBSENT)/libsent-config --cflags` `$(LIBJULIUS)/libjulius-config --cflags` -LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs` +LDFLAGS=@LDFLAGS@ -L$(LIBJULIUS) `$(LIBJULIUS)/libjulius-config --libs | sed -e 's,-ljulius,$(LIBJULIUS)/libjulius.so.0.0.0,g'` -L$(LIBSENT) `$(LIBSENT)/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` RM=@RM@ -f prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/plugin/Makefile b/plugin/Makefile index e340b7e..c9ccdb6 100644 --- a/plugin/Makefile +++ b/plugin/Makefile @@ -9,7 +9,7 @@ CC=gcc CFLAGS=-shared LDFLAGS= J_CFLAGS=-I../libsent/include -I../libjulius/include `../libsent/libsent-config --cflags` `../libjulius/libjulius-config --cflags` -J_LDFLAGS=-L../libjulius `../libjulius/libjulius-config --libs` -L../libsent `../libsent/libsent-config --libs` +J_LDFLAGS=-L../libjulius `../libjulius/libjulius-config --libs | sed -e 's,-ljulius,$(LIBJULIUS)/libjulius.so.0.0.0,g'` -L../libsent `../libsent/libsent-config --libs | sed -e 's,-lsent,$(LIBSENT)/libsent.so.0.0.0,g'` all: adin_oss.jpi audio_postprocess.jpi fvin.jpi feature_postprocess.jpi calcmix.jpi generic_callback.jpi result.jpi
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
