From 7dedde97df741d8adb1ad5fd80e6e3e1af59933a Mon Sep 17 00:00:00 2001 From: q3aql Date: Mon, 14 Mar 2016 17:01:56 +0100 Subject: [PATCH] Enabled shared build of expat (library) --- .../gnu-linux-config/aria2-i386-gnu-linux-cross-build-libs | 2 +- .../gnu-linux-config/aria2-x86_64-gnu-linux-build-libs | 2 +- build-scripts/mingw-config/aria2-i686-w64-mingw-build-libs | 2 +- build-scripts/mingw-config/aria2-x86_64-w64-mingw-build-libs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/gnu-linux-config/aria2-i386-gnu-linux-cross-build-libs b/build-scripts/gnu-linux-config/aria2-i386-gnu-linux-cross-build-libs index 1fc370e..37d84fc 100755 --- a/build-scripts/gnu-linux-config/aria2-i386-gnu-linux-cross-build-libs +++ b/build-scripts/gnu-linux-config/aria2-i386-gnu-linux-cross-build-libs @@ -45,7 +45,7 @@ export LDFLAGS="-m32" wget -c $EXPAT tar jxvf expat-2.1.1.tar.bz2 cd expat-2.1.1/ - CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32" PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER -m32" CXX="$CXX_COMPILER -m32" ./configure --prefix=$PREFIX --enable-static --disable-shared + CFLAGS="-m32" CXXFLAGS="-m32" LDFLAGS="-m32" PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER -m32" CXX="$CXX_COMPILER -m32" ./configure --prefix=$PREFIX --enable-static --enable-shared make make install # diff --git a/build-scripts/gnu-linux-config/aria2-x86_64-gnu-linux-build-libs b/build-scripts/gnu-linux-config/aria2-x86_64-gnu-linux-build-libs index 61eba5a..6e15204 100755 --- a/build-scripts/gnu-linux-config/aria2-x86_64-gnu-linux-build-libs +++ b/build-scripts/gnu-linux-config/aria2-x86_64-gnu-linux-build-libs @@ -41,7 +41,7 @@ cd $BUILD_DIRECTORY wget -c $EXPAT tar jxvf expat-2.1.1.tar.bz2 cd expat-2.1.1/ - PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER" CXX="$CXX_COMPILER" ./configure --prefix=$PREFIX --enable-static --disable-shared + PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/ LD_LIBRARY_PATH=$PREFIX/lib/ CC="$C_COMPILER" CXX="$CXX_COMPILER" ./configure --prefix=$PREFIX --enable-static --enable-shared make make install # diff --git a/build-scripts/mingw-config/aria2-i686-w64-mingw-build-libs b/build-scripts/mingw-config/aria2-i686-w64-mingw-build-libs index 5dcd56b..7193cfa 100755 --- a/build-scripts/mingw-config/aria2-i686-w64-mingw-build-libs +++ b/build-scripts/mingw-config/aria2-i686-w64-mingw-build-libs @@ -38,7 +38,7 @@ cd $BUILD_DIRECTORY wget -c $EXPAT tar jxvf expat-2.1.1.tar.bz2 cd expat-2.1.1/ - CC=$HOST-gcc CXX=$HOST-g++ AR=$HOST-ar RANLIB=$HOST-ranlib ./configure --prefix=$PREFIX --host=$HOST --enable-static --disable-shared + CC=$HOST-gcc CXX=$HOST-g++ AR=$HOST-ar RANLIB=$HOST-ranlib ./configure --prefix=$PREFIX --host=$HOST --enable-static --enable-shared make make install # diff --git a/build-scripts/mingw-config/aria2-x86_64-w64-mingw-build-libs b/build-scripts/mingw-config/aria2-x86_64-w64-mingw-build-libs index b68453b..aa45eae 100755 --- a/build-scripts/mingw-config/aria2-x86_64-w64-mingw-build-libs +++ b/build-scripts/mingw-config/aria2-x86_64-w64-mingw-build-libs @@ -38,7 +38,7 @@ cd $BUILD_DIRECTORY wget -c $EXPAT tar jxvf expat-2.1.1.tar.bz2 cd expat-2.1.1/ - CC=$HOST-gcc CXX=$HOST-g++ AR=$HOST-ar RANLIB=$HOST-ranlib ./configure --prefix=$PREFIX --host=$HOST --enable-static --disable-shared + CC=$HOST-gcc CXX=$HOST-g++ AR=$HOST-ar RANLIB=$HOST-ranlib ./configure --prefix=$PREFIX --host=$HOST --enable-static --enable-shared make make install #