summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-02-08 16:20:55 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-09 09:35:15 +0700
commitb59fbf0e86b94e07ce98522b19d6fdf88e3c2e40 (patch)
tree794e6dd33a48014fcb499ad7ec929aa0b1d72e8a
parent32c43969e75928f69f607a3543f151fa3912d54e (diff)
downloadslackbuilds-b59fbf0e86b94e07ce98522b19d6fdf88e3c2e40.tar.gz
system/openrc: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/openrc/openrc.SlackBuild7
-rw-r--r--system/openrc/openrc.info2
2 files changed, 5 insertions, 4 deletions
diff --git a/system/openrc/openrc.SlackBuild b/system/openrc/openrc.SlackBuild
index c32e6799cd..ea33861b2c 100644
--- a/system/openrc/openrc.SlackBuild
+++ b/system/openrc/openrc.SlackBuild
@@ -23,6 +23,9 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220208 bkw: modified by SlackBuilds.org to fix 15.0 build, and to
+# actually use SLKCFLAGS.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=openrc
@@ -39,9 +42,6 @@ if [ -z "$ARCH" ]; then
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
@@ -93,6 +93,7 @@ MAKEARGS+=(MKTERMCAP=ncurses)
MAKEARGS+=(MKSYSVINIT=no)
MAKEARGS+=(MKBASHCOMP=yes)
MAKEARGS+=(MKZSHCOMP=yes)
+MAKEARGS+=(CFLAGS="$SLKCFLAGS -fcommon")
#MAKEARGS+=(BRANDING="$(cat /etc/slackware-version)")
make "${MAKEARGS[@]}"
diff --git a/system/openrc/openrc.info b/system/openrc/openrc.info
index 13363e8341..07ba3a7b65 100644
--- a/system/openrc/openrc.info
+++ b/system/openrc/openrc.info
@@ -1,7 +1,7 @@
PRGNAM="openrc"
VERSION="0.42.1"
HOMEPAGE="https://github.com/OpenRC/openrc"
-DOWNLOAD="https://github.com/OpenRC/openrc/archive/0.42.1.tar.gz"
+DOWNLOAD="https://github.com/OpenRC/openrc/archive/0.42.1/openrc-0.42.1.tar.gz"
MD5SUM="1a3de67032d59529460f150e2db859f1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""