merge ready

Dockerfile

@@ -14,7 +14,8 @@ COPY . $BUILDDIR
 
 # Package requirements
 ENV PACKAGES gcc bash wget perl perl-dev automake autoconf libtool file xz \
-             make libc-dev linux-headers g++ sed bison cmake gfortran
+             make libc-dev linux-headers g++ sed bison cmake gfortran \
+             awk grep
 
 # Build and do not keep "static libraries"
 RUN  mkdir -p ${INSTALLDIR}/lib && ln -s ${INSTALLDIR}/lib64 ${INSTALLDIR}/lib && \

mkit.config.sh

@@ -7,7 +7,7 @@
 
 ### ENV ###
 
- export srcget="0.0.12.4" #  srcget version
+ export srcget="0.0.12.8" #  srcget version
 
  # vt100 family sequences
  export ESC=""

modules/bzip2/build.sh

@@ -3,7 +3,7 @@
 #
 build_bzip2_core()
 {
- typeset rc=0 cwd=""
+ typeset cwd=""
  export rc_conf=0 rc_make=0 rc_makeso=0 rc_makeinstall=0
  typeset id="$1"; shift   # build id
  typeset dir="$1"; shift  # src directory

modules/damageproto/build.sh

@@ -1,5 +1,7 @@
 build_damageproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf damageproto $srcdir_damageproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf damageproto $srcdir_damageproto
+
  return $?
 }

modules/dri2proto/build.sh

@@ -1,5 +1,7 @@
 build_dri2proto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf dri2proto $srcdir_dri2proto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf dri2proto $srcdir_dri2proto
+
  return $?
 }

modules/expat2_1/build.sh

@@ -1,5 +1,6 @@
 build_expat2_1()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf expat2_1 $srcdir_expat2_1 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf expat2_1 $srcdir_expat2_1
  return $?
 }

modules/fixesproto/build.sh

@@ -1,5 +1,7 @@
 build_fixesproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf fixesproto $srcdir_fixesproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf fixesproto $srcdir_fixesproto
+
  return $?
 }

modules/gcc/build.sh

@@ -35,8 +35,8 @@ build_gcc()
                    --with-system-zlib \
                    --disable-nls \
                    ${extra_args}
- rc=$?
 
+ rc=$?
  [ ! -z "$OLD_LP" ] && { LD_LIBRARY_PATH="$OLD_LP"; unset OLD_LP; }
 
  return $rc

modules/glproto/build.sh

@@ -1,5 +1,7 @@
 build_glproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf glproto $srcdir_glproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf glproto $srcdir_glproto
+
  return $?
 }

modules/haproxy/build.sh

@@ -2,7 +2,6 @@
 # Build haproxy
 build_haproxy_core()
 {
- typeset rc=0
  export rc_conf=0 rc_make=0 rc_makeinstall=0
  typeset id="$1";  shift  # build id
  typeset dir="$1"; shift  # src directory

modules/inputproto/build.sh

@@ -1,5 +1,7 @@
 build_inputproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf inputproto $srcdir_inputproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf inputproto $srcdir_inputproto
+
  return $?
 }

modules/kbproto/build.sh

@@ -1,5 +1,7 @@
 build_kbproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf kbproto $srcdir_kbproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf kbproto $srcdir_kbproto
+
  return $?
 }

modules/leptonica/build.sh

@@ -1,9 +1,7 @@
 build_leptonica()
 {
- typeset rc=0
-
  [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"]
- build_gnuconf leptonica $srcdir_leptonica; rc=$?
+ build_gnuconf leptonica $srcdir_leptonica
 
  return $?
 }

modules/libdrm/build.sh

@@ -1,5 +1,7 @@
 build_libdrm()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf libdrm $srcdir_libdrm 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf libdrm $srcdir_libdrm
+
  return $?
 }

modules/libffi/build.sh

@@ -1,11 +1,7 @@
 #
 build_libffi()
 {
- typeset rc=0 dir=""
-
- build_gnuconf libffi $srcdir_libffi
- rc=$?
- [ $rc -ne 0 ] && return $rc
+ build_gnuconf libffi $srcdir_libffi || return $?
 
  # libffi ignores --libdir and --includedir options of configure
  # installs includes in $prefix/lib/libffi-version/include/ etc

modules/libtiff/build.sh

@@ -2,6 +2,6 @@ build_libtiff()
 {
  [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig";
 
- build_gnuconf libtiff $srcdir_libtiff 
+ build_gnuconf libtiff $srcdir_libtiff
  return $?
 }

modules/libxrender/build.sh

@@ -1,5 +1,7 @@
 build_libxrender()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf libxrender $srcdir_libxrender 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf libxrender $srcdir_libxrender
+
  return $?
 }

modules/lua/build.sh

@@ -11,7 +11,6 @@ lua_platform()
 # Build lua
 build_lua_core()
 {
- typeset rc=0
  export rc_conf=0 rc_make=0 rc_makeinstall=0
  typeset id="$1";  shift  # build id
  typeset dir="$1"; shift  # src directory

modules/nettle/build.sh

@@ -1,8 +1,6 @@
 build_nettle()
 {
- typeset rc=0
-
- build_gnuconf nettle $srcdir_nettle; rc=$?
+ build_gnuconf nettle $srcdir_nettle
 
  return $?
 }

modules/pciaccess/build.sh

@@ -1,5 +1,7 @@
 build_pciaccess()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf pciaccess $srcdir_pciaccess 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf pciaccess $srcdir_pciaccess
+
  return $?
 }

modules/perl/build.sh

@@ -2,7 +2,6 @@
 # Build perl - custom function only for perl
 build_perl_core()
 {
- typeset rc=0
  export rc_conf=0 rc_make=0 rc_makeinstall=0
  typeset id="$1";  shift  # build id
  typeset dir="$1"; shift  # src directory

modules/proj/build.sh

@@ -2,6 +2,6 @@ build_proj()
 {
  [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig";
 
- build_gnuconf proj $srcdir_proj 
+ build_gnuconf proj $srcdir_proj
  return $?
 }

modules/pthreadstubs/build.sh

@@ -1,5 +1,7 @@
 build_pthreadstubs()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf pthreadstubs $srcdir_pthreadstubs 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf pthreadstubs $srcdir_pthreadstubs
+
  return $?
 }

modules/python3/build.sh

@@ -15,12 +15,9 @@ build_python3()
             --with-ensurepip=yes
  rc=$?
 
- # remove this file until I have proof I need it ;)
- # is it for building modules? Not clear in Makefile's "libainstall" target
- for fn in $prefix/lib/python*/config-*/lib*.a
- do
-   [ -f "$fn" ] && rm -f "$fn"
- done
+ # remove all .a files
+ # note: the following line could fail if any filename as a "space", can this happen?
+ find $prefix -type f -name '*\.a' | xargs rm
 
  return $rc
 }

modules/randrproto/build.sh

@@ -1,5 +1,7 @@
 build_randrproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf randrproto $srcdir_randrproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf randrproto $srcdir_randrproto
+
  return $?
 }

modules/renderproto/build.sh

@@ -1,5 +1,5 @@
 build_renderproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf renderproto $srcdir_renderproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf renderproto $srcdir_renderproto
  return $?
 }

modules/uwsgi/build.sh

@@ -1,7 +1,7 @@
 #
 build_uwsgi()
 {
- typeset rc=0 dir=""
+ typeset dir=""
 
  [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
 

modules/x11/build.sh

@@ -1,5 +1,8 @@
 build_x11()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf x11 $srcdir_x11 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+
+ build_gnuconf x11 $srcdir_x11
+
  return $?
 }

modules/xau/build.sh

@@ -1,5 +1,7 @@
 build_xau()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xau $srcdir_xau 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf xau $srcdir_xau
+
  return $?
 }

modules/xcb/build.sh

@@ -1,5 +1,5 @@
 build_xcb()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xcb $srcdir_xcb 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xcb $srcdir_xcb
  return $?
 }

modules/xcbproto/build.sh

@@ -1,5 +1,5 @@
 build_xcbproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xcbproto $srcdir_xcbproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xcbproto $srcdir_xcbproto
  return $?
 }

modules/xdamage/build.sh

@@ -1,5 +1,7 @@
 build_xdamage()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xdamage $srcdir_xdamage 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf xdamage $srcdir_xdamage
+
  return $?
 }

modules/xextproto/build.sh

@@ -1,5 +1,5 @@
 build_xextproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xextproto $srcdir_xextproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xextproto $srcdir_xextproto
  return $?
 }

modules/xf86vidmodeproto/build.sh

@@ -1,5 +1,5 @@
 build_xf86vidmodeproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xf86vidmodeproto $srcdir_xf86vidmodeproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xf86vidmodeproto $srcdir_xf86vidmodeproto
  return $?
 }

modules/xfixes/build.sh

@@ -1,5 +1,5 @@
 build_xfixes()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xfixes $srcdir_xfixes 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xfixes $srcdir_xfixes
  return $?
 }

modules/xproto/build.sh

@@ -1,5 +1,5 @@
 build_xproto()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xproto $srcdir_xproto 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xproto $srcdir_xproto
  return $?
 }

modules/xrandr/build.sh

@@ -1,5 +1,7 @@
 build_xrandr()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xrandr $srcdir_xrandr 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf xrandr $srcdir_xrandr
+
  return $?
 }

modules/xtrans/build.sh

@@ -1,14 +1,15 @@
 build_xtrans()
 {
- typeset rc=0
+ typeset rc
 
  [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"]
+
  build_gnuconf xtrans $srcdir_xtrans; rc=$?
 
  [ -f "${prefix}/share/pkgconfig/xtrans.pc" ] &&
  {
   cp "${prefix}/share/pkgconfig/xtrans.pc" "${prefix}/lib/pkgconfig/xtrans.pc"
  }
 
- return $?
+ return $rc
 }

modules/xxf86vm/build.sh

@@ -1,5 +1,6 @@
 build_xxf86vm()
 {
- [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"; build_gnuconf xxf86vm $srcdir_xxf86vm 
+ [ -d "${prefix}/lib/pkgconfig" ] && export PKG_CONFIG_PATH="${prefix}/lib/pkgconfig"
+ build_gnuconf xxf86vm $srcdir_xxf86vm
  return $?
 }