diff options
Diffstat (limited to 'source/n/NetworkManager/NetworkManager.SlackBuild')
-rwxr-xr-x | source/n/NetworkManager/NetworkManager.SlackBuild | 83 |
1 files changed, 41 insertions, 42 deletions
diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index fb108b5bf..7fa8d4a56 100755 --- a/source/n/NetworkManager/NetworkManager.SlackBuild +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2010, 2011, 2014, 2016 Robby Workman, Northport, Alabama, USA -# Copyright 2013, 2014, 2015, 2016, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2013, 2014, 2015, 2016, 2018, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -53,7 +53,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-$TMP} if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -98,50 +98,44 @@ for dfile in $CWD/patches/* ; do zcat $dfile | patch -p1 --verbose || exit 1 done -# For git-patched builds -autoreconf -vif -automake -./autogen.sh - -# Configuring --enable-json-validation --enable-ovs requires the Jansson -# json-c library. If there's any interest or usefulness with that, let me -# know. The library is fairly small, but in order to actually use team -# interfaces will probably require more stuff (not sure how much). -# -# Update September 2018: Added those options since we needed Jansson -# already for HTTP/2 support. - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --with-udev-dir=/lib/udev \ - --with-pppd-plugin-dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \ - --with-crypto=nss \ - --enable-more-warnings=no \ - --without-resolvconf \ - --with-dhcpcd=/sbin/dhcpcd \ - --with-dhclient=yes \ - --with-modem-manager-1=yes \ - --with-nmtui=yes \ - --enable-json-validation \ - --enable-ovs \ - --with-consolekit=no \ - --with-session-tracking=elogind \ - --with-suspend-resume=elogind \ - --with-hostname-persist=slackware \ - --build=$TARGET || exit 1 - -make $NUMJOBS || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + --buildtype=release \ + -Dudev_dir=/lib/udev \ + -Ddbus_conf_dir=/usr/share/dbus-1/system.d \ + -Dpppd_plugin_dir=/usr/lib${LIBDIRSUFFIX}/pppd/$PPPD \ + -Dcrypto=nss \ + -Dresolvconf=false \ + -Ddhcpcd=/sbin/dhcpcd \ + -Dconfig_dhcp_default=dhcpcd \ + -Ddhclient=/sbin/dhclient \ + -Dmodem_manager=true \ + -Dnmtui=true \ + -Dovs=true \ + -Dsession_tracking_consolekit=false \ + -Dsession_tracking=elogind \ + -Dsuspend_resume=elogind \ + -Dhostname_persist=slackware \ + -Dsystemd_journal=false \ + -Dsystemdsystemunitdir=no \ + -Dmore_logging=false \ + -Dselinux=false \ + -Dlibaudit=no \ + -Dqt=false \ + -Ddocs=true \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -158,6 +152,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find $PKG/usr/man -type f -exec gzip -9 {} \+ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# Relocate: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +mv $PKG/usr/share/doc/NetworkManager/examples $PKG/usr/doc/$PKGNAM-$VERSION +rm -r $PKG/usr/share/doc + # In case NetworkManager tries to install something here: rm -f $PKG/etc/rc.d/rc.networkmanager |