libraries/xmlrpc-c: Fix doc perms, add -j1 to make.

Signed-off-by: B. Watson <yalhcru@gmail.com>

1 files changed, 25 insertions, 16 deletions

diff --git a/libraries/xmlrpc-c/xmlrpc-c.SlackBuild b/libraries/xmlrpc-c/xmlrpc-c.SlackBuild
index 7c3042ade7..f701999820 100644
--- a/libraries/xmlrpc-c/xmlrpc-c.SlackBuild
+++ b/libraries/xmlrpc-c/xmlrpc-c.SlackBuild
@@ -22,25 +22,28 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220425 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - fix doc permissions.
+# - add -j1 to make commands. parallel builds are unreliable: it will
+#   work maybe once every 3 attempts.
+# - remove useless install instructions from doc dir.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xmlrpc-c
 VERSION=${VERSION:-1.33.16}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -50,8 +53,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -73,11 +76,11 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# 20220425 bkw: tarball permissions are terrible, please don't revert
+# to template here.
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -89,16 +92,22 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
-make
-make install DESTDIR=$PKG
+# 20220425 bkw: parallel builds (MAKEFLAGS=-jN) fail, please don't
+# remove the -j1 here.
+make -j1
+make -j1 install DESTDIR=$PKG
 
-# Remove empty man dir
-rm -rf $PKG/usr/man
+# 20220425 bkw: --disable-static not accepted, so:
+rm -f $PKG/usr/lib*/*.a
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# Remove empty man dir
+rm -rf $PKG/usr/man
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+rm -f doc/{INSTALL,configure_doc} # 20220425 bkw: build instructions, useless.
 cp -a README doc/* examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild