Skip to content

Commit 77d1880

Browse files
bbidulockbbidulock
committed
- updated build scripts
1 parent fdae3e7 commit 77d1880

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

‎arch/PKGBUILD.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# vim: ft=sh
1+
#!/bin/bash
22
#
33

44
# Maintainer: Brian Bidulock <[email protected]>

‎cache/slackware-13.37-x86_64-config.cache

+4-7
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ bld_cv_pkg_cmd_GROFF=${bld_cv_pkg_cmd_GROFF='slackpkg install groff'}
1414
bld_cv_pkg_cmd_GZIP_CMD=${bld_cv_pkg_cmd_GZIP_CMD='slackpkg install gzip'}
1515
bld_cv_pkg_cmd_JAR=${bld_cv_pkg_cmd_JAR='slackpkg install gcc-java'}
1616
bld_cv_pkg_cmd_JARSIGNER=${bld_cv_pkg_cmd_JARSIGNER='slackpkg install gcc-java'}
17-
bld_cv_pkg_cmd_JAVAC=${bld_cv_pkg_cmd_JAVAC='slackpkg install gcc-java'}
1817
bld_cv_pkg_cmd_JAVADOC=${bld_cv_pkg_cmd_JAVADOC='slackpkg install gcc-java'}
1918
bld_cv_pkg_cmd_JAVAH=${bld_cv_pkg_cmd_JAVAH='slackpkg install gcc-java'}
2019
bld_cv_pkg_cmd_KEYTOOL=${bld_cv_pkg_cmd_KEYTOOL='slackpkg install gcc-java'}
2120
bld_cv_pkg_cmd_LATEX=${bld_cv_pkg_cmd_LATEX='slackpkg install tetex'}
2221
bld_cv_pkg_cmd_LDCONFIG=${bld_cv_pkg_cmd_LDCONFIG='slackpkg install perl'}
2322
bld_cv_pkg_cmd_LSMOD=${bld_cv_pkg_cmd_LSMOD='slackpkg install module-init-tools'}
2423
bld_cv_pkg_cmd_LSOF=${bld_cv_pkg_cmd_LSOF='slackpkg install lsof'}
24+
bld_cv_pkg_cmd_LZMA_CMD=${bld_cv_pkg_cmd_LZMA_CMD='slackpkg install xz'}
2525
bld_cv_pkg_cmd_MAKEPKG=${bld_cv_pkg_cmd_MAKEPKG='slackpkg install pkgtools'}
2626
bld_cv_pkg_cmd_MD5SUM=${bld_cv_pkg_cmd_MD5SUM='slackpkg install coreutils'}
2727
bld_cv_pkg_cmd_MODPROBE=${bld_cv_pkg_cmd_MODPROBE='slackpkg install module-init-tools'}
@@ -30,14 +30,12 @@ bld_cv_pkg_cmd_PDFTEX=${bld_cv_pkg_cmd_PDFTEX='slackpkg install tetex'}
3030
bld_cv_pkg_cmd_PIC=${bld_cv_pkg_cmd_PIC='slackpkg install groff'}
3131
bld_cv_pkg_cmd_PSLATEX=${bld_cv_pkg_cmd_PSLATEX='slackpkg install tetex'}
3232
bld_cv_pkg_cmd_REFER=${bld_cv_pkg_cmd_REFER='slackpkg install groff'}
33-
bld_cv_pkg_cmd_RPM=${bld_cv_pkg_cmd_RPM='slackpkg install rpm'}
3433
bld_cv_pkg_cmd_RPMBUILD=${bld_cv_pkg_cmd_RPMBUILD='slackpkg install rpm'}
3534
bld_cv_pkg_cmd_SHA1SUM=${bld_cv_pkg_cmd_SHA1SUM='slackpkg install coreutils'}
3635
bld_cv_pkg_cmd_SHA256SUM=${bld_cv_pkg_cmd_SHA256SUM='slackpkg install coreutils'}
3736
bld_cv_pkg_cmd_SLACKDTXT=${bld_cv_pkg_cmd_SLACKDTXT='slackpkg install slacktrack'}
3837
bld_cv_pkg_cmd_SLACKPKG=${bld_cv_pkg_cmd_SLACKPKG='slackpkg install slackpkg'}
3938
bld_cv_pkg_cmd_SLACKTRACK=${bld_cv_pkg_cmd_SLACKTRACK='slackpkg install slacktrack'}
40-
bld_cv_pkg_cmd_SOELIM=${bld_cv_pkg_cmd_SOELIM='slackpkg install groff'}
4139
bld_cv_pkg_cmd_TBL=${bld_cv_pkg_cmd_TBL='slackpkg install groff'}
4240
bld_cv_pkg_cmd_TEX=${bld_cv_pkg_cmd_TEX='slackpkg install tetex'}
4341
bld_cv_pkg_cmd_ZIP=${bld_cv_pkg_cmd_ZIP='slackpkg install infozip'}
@@ -59,14 +57,14 @@ bld_cv_pkg_name_GROFF=${bld_cv_pkg_name_GROFF=groff}
5957
bld_cv_pkg_name_GZIP_CMD=${bld_cv_pkg_name_GZIP_CMD=gzip}
6058
bld_cv_pkg_name_JAR=${bld_cv_pkg_name_JAR=gcc-java}
6159
bld_cv_pkg_name_JARSIGNER=${bld_cv_pkg_name_JARSIGNER=gcc-java}
62-
bld_cv_pkg_name_JAVAC=${bld_cv_pkg_name_JAVAC=gcc-java}
6360
bld_cv_pkg_name_JAVADOC=${bld_cv_pkg_name_JAVADOC=jdk}
6461
bld_cv_pkg_name_JAVAH=${bld_cv_pkg_name_JAVAH=gcc-java}
6562
bld_cv_pkg_name_KEYTOOL=${bld_cv_pkg_name_KEYTOOL=gcc-java}
6663
bld_cv_pkg_name_LATEX=${bld_cv_pkg_name_LATEX=tetex}
6764
bld_cv_pkg_name_LDCONFIG=${bld_cv_pkg_name_LDCONFIG=glibc-solibs}
6865
bld_cv_pkg_name_LSMOD=${bld_cv_pkg_name_LSMOD=module-init-tools}
6966
bld_cv_pkg_name_LSOF=${bld_cv_pkg_name_LSOF=lsof}
67+
bld_cv_pkg_name_LZMA_CMD=${bld_cv_pkg_name_LZMA_CMD=xz}
7068
bld_cv_pkg_name_MAKEPKG=${bld_cv_pkg_name_MAKEPKG=pkgtools}
7169
bld_cv_pkg_name_MD5SUM=${bld_cv_pkg_name_MD5SUM=coreutils}
7270
bld_cv_pkg_name_MODPROBE=${bld_cv_pkg_name_MODPROBE=module-init-tools}
@@ -75,14 +73,12 @@ bld_cv_pkg_name_PDFTEX=${bld_cv_pkg_name_PDFTEX=tetex}
7573
bld_cv_pkg_name_PIC=${bld_cv_pkg_name_PIC=groff}
7674
bld_cv_pkg_name_PSLATEX=${bld_cv_pkg_name_PSLATEX=tetex}
7775
bld_cv_pkg_name_REFER=${bld_cv_pkg_name_REFER=groff}
78-
bld_cv_pkg_name_RPM=${bld_cv_pkg_name_RPM=rpm}
7976
bld_cv_pkg_name_RPMBUILD=${bld_cv_pkg_name_RPMBUILD=rpm}
8077
bld_cv_pkg_name_SHA1SUM=${bld_cv_pkg_name_SHA1SUM=coreutils}
8178
bld_cv_pkg_name_SHA256SUM=${bld_cv_pkg_name_SHA256SUM=coreutils}
8279
bld_cv_pkg_name_SLACKDTXT=${bld_cv_pkg_name_SLACKDTXT=slacktrack}
8380
bld_cv_pkg_name_SLACKPKG=${bld_cv_pkg_name_SLACKPKG=slackpkg}
8481
bld_cv_pkg_name_SLACKTRACK=${bld_cv_pkg_name_SLACKTRACK=slacktrack}
85-
bld_cv_pkg_name_SOELIM=${bld_cv_pkg_name_SOELIM=groff}
8682
bld_cv_pkg_name_TBL=${bld_cv_pkg_name_TBL=groff}
8783
bld_cv_pkg_name_TCL_H=${bld_cv_pkg_name_TCL_H=tcl}
8884
bld_cv_pkg_name_TEX=${bld_cv_pkg_name_TEX=tetex}
@@ -156,7 +152,7 @@ bld_cv_pkg_ver_GCJDBTOOL=${bld_cv_pkg_ver_GCJDBTOOL=4.5.2}
156152
bld_cv_pkg_ver_GCJH=${bld_cv_pkg_ver_GCJH=4.5.2}
157153
bld_cv_pkg_ver_GCJ_CNI_H=${bld_cv_pkg_ver_GCJ_CNI_H=4.5.2}
158154
bld_cv_pkg_ver_GNUPLOT=${bld_cv_pkg_ver_GNUPLOT=4.4.3}
159-
bld_cv_pkg_ver_GPG=${bld_cv_pkg_ver_GPG=1.4.11}
155+
bld_cv_pkg_ver_GPG=${bld_cv_pkg_ver_GPG=2.0.17}
160156
bld_cv_pkg_ver_GROFF=${bld_cv_pkg_ver_GROFF=1.21}
161157
bld_cv_pkg_ver_GZIP_CMD=${bld_cv_pkg_ver_GZIP_CMD=1.4}
162158
bld_cv_pkg_ver_JAR=${bld_cv_pkg_ver_JAR=4.5.2}
@@ -169,6 +165,7 @@ bld_cv_pkg_ver_LATEX=${bld_cv_pkg_ver_LATEX=3.0}
169165
bld_cv_pkg_ver_LDCONFIG=${bld_cv_pkg_ver_LDCONFIG=2.13}
170166
bld_cv_pkg_ver_LSMOD=${bld_cv_pkg_ver_LSMOD=3.12}
171167
bld_cv_pkg_ver_LSOF=${bld_cv_pkg_ver_LSOF=4.83}
168+
bld_cv_pkg_ver_LZMA_CMD=${bld_cv_pkg_ver_LZMA_CMD=5.0.2}
172169
bld_cv_pkg_ver_MAKEPKG=${bld_cv_pkg_ver_MAKEPKG=13.37}
173170
bld_cv_pkg_ver_MD5SUM=${bld_cv_pkg_ver_MD5SUM=8.11}
174171
bld_cv_pkg_ver_MODPROBE=${bld_cv_pkg_ver_MODPROBE=3.12}

‎slack/SLKBUILD.in

+21
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#Maintainer: Brian Bidulock <[email protected]>
33
#Former Maintainer(s): none
44
# @configure_input@
5+
PACKAGER="${PACKAGER:-Brian Bidulock <bidulock@openss7.org>}"
56
#Mandatory
67
# pkgname - package name, the name of the software.
78
pkgname=@PACKAGE@
@@ -67,6 +68,23 @@ url="http://www.openss7.org/"
6768
# doinst.sh to move them over if appropriate to do so during install.
6869
dotnew=\
6970
(
71+
'etc/conf.d/openss7'
72+
'etc/conf.d/specfs'
73+
'etc/conf.d/strace'
74+
'etc/conf.d/streams'
75+
'etc/conf.d/strerr'
76+
'etc/nslconfig.d/openss7'
77+
'etc/openss7.conf'
78+
'etc/rc.d/openss7'
79+
'etc/rc.d/specfs'
80+
'etc/rc.d/strace'
81+
'etc/rc.d/streams'
82+
'etc/rc.d/strerr'
83+
'etc/snmp/snmp.d/01openss7'
84+
'etc/sock2path.d/openss7'
85+
'etc/streams.conf'
86+
'etc/strload.conf'
87+
'etc/strsetup.conf'
7088
)
7189
# CXXCFLAGS/CFLAGS - You can set these to override the default flags which are
7290
# "-O2 -march=$arch -mtune=i686" where $arch is the variable you set in
@@ -119,6 +137,7 @@ build() { :
119137
./configure \
120138
${CC:+CC="${CC}"} \
121139
${CFLAGS+CFLAGS="${CFLAGS}"} \
140+
${WFLAGS+WFLAGS="${WFLAGS}"} \
122141
${LD+LD="${LD}"} \
123142
${LDFLAGS+LDFLAGS="${LDFLAGS}"} \
124143
${CPPFLAGS+CPPFLAGS="${CPPFLAGS}"} \
@@ -128,6 +147,7 @@ build() { :
128147
${CXXCPP+CXXCPP="${CXXCPP:-$CPP}"} \
129148
CONFIG_SITE=${csite_file} \
130149
MODPOST_CACHE=${mpost_file} \
150+
${PACKAGE_SLKOPTIONS} \
131151
--cache-file=${cache_file} \
132152
--prefix=/usr \
133153
--build=@build@ \
@@ -161,6 +181,7 @@ build() { :
161181
--disable-32bit-libs \
162182
--disable-papers-html \
163183
--with-gnu-ld \
184+
${BUILD_CFGOPTIONS} \
164185
|| { rm -f ${cache_file} ${csite_file} ${mpost_file} ; exit 1 ; }
165186
make || return 1
166187
# make pdf || return 1

0 commit comments

Comments
 (0)