From f0f81e894957160b24def0101f9bbb7b07b4c6f2 Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Oct 28 2016 10:46:51 +0000 Subject: Remove static libs --- diff --git a/docker-builder-data/build/script/common/manager.sh b/docker-builder-data/build/script/common/manager.sh index 1517f4b..6f455da 100755 --- a/docker-builder-data/build/script/common/manager.sh +++ b/docker-builder-data/build/script/common/manager.sh @@ -141,6 +141,15 @@ md5() { echo "${MD5:0:32}" } +remove_recursive() { + rm -f "$1/$2" + for FILE in $1; do + if [ -d "$1/$FILE" ]; then + remove_recursive "$1/$FILE" $2 + fi + done +} + message() { echo " ------ $1" } diff --git a/docker-builder-data/build/script/include/inc-pkall-none.sh b/docker-builder-data/build/script/include/inc-pkall-none.sh index 886df05..978c882 100644 --- a/docker-builder-data/build/script/include/inc-pkall-none.sh +++ b/docker-builder-data/build/script/include/inc-pkall-none.sh @@ -8,6 +8,12 @@ PK_CONFIGURE_OPTIONS= PK_CFLAGS= PK_CPPFLAGS= +PK_CONFIGURE_OPTIONS_DEFAULT=" \ + --prefix=$INSTALL_PACKET_DIR \ + --disable-static \ + --enable-shared " + + pkdownload() { return 0 } diff --git a/docker-builder-data/build/script/include/inc-pkbuild-default.sh b/docker-builder-data/build/script/include/inc-pkbuild-default.sh index ea32549..07d2834 100644 --- a/docker-builder-data/build/script/include/inc-pkbuild-default.sh +++ b/docker-builder-data/build/script/include/inc-pkbuild-default.sh @@ -1,6 +1,7 @@ # PK_DIRNAME # PK_CONFIGURE_OPTIONS +# PK_CONFIGURE_OPTIONS_DEFAULT # PK_CFLAGS # PK_CPPFLAGS @@ -8,7 +9,10 @@ pkbuild() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME" || return 1 if ! check_packet_function $NAME build.cunfigure; then CFLAGS="$PK_CFLAGS $CFLAGS" CPPFLAGS="$PK_CPPFLAGS $CPPFLAGS" \ - ./configure --prefix=$INSTALL_PACKET_DIR $PK_CONFIGURE_OPTIONS || return 1 + ./configure \ + $PK_CONFIGURE_OPTIONS_DEFAULT \ + $PK_CONFIGURE_OPTIONS \ + || return 1 set_done $NAME build.cunfigure fi diff --git a/docker-builder-data/build/script/include/inc-pkinstall_release-default.sh b/docker-builder-data/build/script/include/inc-pkinstall_release-default.sh index 7f28a28..7065f75 100644 --- a/docker-builder-data/build/script/include/inc-pkinstall_release-default.sh +++ b/docker-builder-data/build/script/include/inc-pkinstall_release-default.sh @@ -3,5 +3,13 @@ pkinstall_release() { if ! copy "$INSTALL_PACKET_DIR" "$INSTALL_RELEASE_PACKET_DIR"; then return 1 fi - rm -r -f "$INSTALL_RELEASE_PACKET_DIR/include" + + rm -rf "$INSTALL_RELEASE_PACKET_DIR/include" + remove_recursive "$INSTALL_RELEASE_PACKET_DIR/lib" *.a + remove_recursive "$INSTALL_RELEASE_PACKET_DIR/lib64" *.a + rm -rf "$INSTALL_RELEASE_PACKET_DIR/share/aclocal" + rm -rf "$INSTALL_RELEASE_PACKET_DIR/share/devhelp" + rm -rf "$INSTALL_RELEASE_PACKET_DIR/share/doc" + rm -rf "$INSTALL_RELEASE_PACKET_DIR/share/gtk-doc" + rm -rf "$INSTALL_RELEASE_PACKET_DIR/share/man" } diff --git a/docker-builder-data/build/script/packet/ffmpeg-3.1.5.sh b/docker-builder-data/build/script/packet/ffmpeg-3.1.5.sh index f3b201d..d1ec5f4 100644 --- a/docker-builder-data/build/script/packet/ffmpeg-3.1.5.sh +++ b/docker-builder-data/build/script/packet/ffmpeg-3.1.5.sh @@ -13,8 +13,6 @@ PK_ARCHIVE="$PK_DIRNAME.tar.bz2" PK_URL="http://ffmpeg.org/releases/$PK_ARCHIVE" PK_CONFIGURE_OPTIONS=" \ - --disable-static \ - --enable-shared \ --enable-rpath \ --enable-gpl \ --enable-libx264 \ @@ -23,4 +21,3 @@ PK_CONFIGURE_OPTIONS=" \ --enable-libvorbis" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh - \ No newline at end of file diff --git a/docker-builder-data/build/script/packet/fftw-3.3.5.sh b/docker-builder-data/build/script/packet/fftw-3.3.5.sh index 57c7e2a..cd29881 100644 --- a/docker-builder-data/build/script/packet/fftw-3.3.5.sh +++ b/docker-builder-data/build/script/packet/fftw-3.3.5.sh @@ -4,6 +4,6 @@ PK_DIRNAME="fftw-3.3.5" PK_ARCHIVE="$PK_DIRNAME.tar.gz" PK_URL="http://fftw.org/$PK_ARCHIVE" -PK_CONFIGURE_OPTIONS="--enable-double --disable-static --enable-shared" +PK_CONFIGURE_OPTIONS="--enable-double" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/fftwsingle-3.3.5.sh b/docker-builder-data/build/script/packet/fftwsingle-3.3.5.sh index b9a1d82..310b104 100644 --- a/docker-builder-data/build/script/packet/fftwsingle-3.3.5.sh +++ b/docker-builder-data/build/script/packet/fftwsingle-3.3.5.sh @@ -4,6 +4,6 @@ PK_DIRNAME="fftw-3.3.5" PK_ARCHIVE="$PK_DIRNAME.tar.gz" PK_URL="http://fftw.org/$PK_ARCHIVE" -PK_CONFIGURE_OPTIONS="--enable-single --disable-static --enable-shared" +PK_CONFIGURE_OPTIONS="--enable-single" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/sdl-2.0.5.sh b/docker-builder-data/build/script/packet/sdl-2.0.5.sh index 062fbb7..4db2aaa 100644 --- a/docker-builder-data/build/script/packet/sdl-2.0.5.sh +++ b/docker-builder-data/build/script/packet/sdl-2.0.5.sh @@ -4,4 +4,6 @@ PK_DIRNAME="SDL2-2.0.5" PK_ARCHIVE="$PK_DIRNAME.tar.gz" PK_URL="https://www.libsdl.org/release/$PK_ARCHIVE" +PK_CONFIGURE_OPTIONS_DEFAULT="--prefix=$INSTALL_PACKET_DIR" + source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/x264-master.sh b/docker-builder-data/build/script/packet/x264-master.sh index b39bb54..4b1c6b9 100644 --- a/docker-builder-data/build/script/packet/x264-master.sh +++ b/docker-builder-data/build/script/packet/x264-master.sh @@ -3,6 +3,4 @@ DEPS="yasm-1.3.0" PK_DIRNAME="x264" PK_URL="http://git.videolan.org/git/$PK_DIRNAME.git" -PK_CONFIGURE_OPTIONS="--enable-shared" - source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh