Minor fixes to CC variable and other build options in base/{signify,swig,sysklogd}
This commit is contained in:
parent
f4a8df87a1
commit
b003d86866
3 changed files with 13 additions and 12 deletions
|
@ -21,19 +21,21 @@ build() {
|
||||||
# in by xorg and qt5-based applications. We'll keep it contained to the
|
# in by xorg and qt5-based applications. We'll keep it contained to the
|
||||||
# signify source directory by modifying the pkgconfig path and CFLAGS and LDFLAGS.
|
# signify source directory by modifying the pkgconfig path and CFLAGS and LDFLAGS.
|
||||||
|
|
||||||
mkdir libbsd && cd libbsd
|
mkdir -p libbsd && cd libbsd
|
||||||
tar xf "$srcdir"/libbsd-$libbsdversion.tar.?z
|
|
||||||
cd libbsd-$libbsdversion
|
(
|
||||||
./configure --prefix="$PWD"/../
|
tar xf "$srcdir"/libbsd-$libbsdversion.tar.?z
|
||||||
make && make install
|
cd libbsd-$libbsdversion
|
||||||
cd ..
|
./configure --prefix="$PWD"/../
|
||||||
|
make && make install
|
||||||
|
)
|
||||||
|
|
||||||
LIBBSDPATH="$PWD"
|
LIBBSDPATH="$PWD"
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
PKG_CONFIG_PATH="$pkg_CONFIG_PATH:$LIBBSDPATH/lib/pkgconfig"
|
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$LIBBSDPATH/lib/pkgconfig"
|
||||||
applypatch $srcdir/sha2.h.patch
|
applypatch $srcdir/sha2.h.patch
|
||||||
make CC="$CC -static" \
|
make CC+=" -static" \
|
||||||
CFLAGS="-I$LIBBSDPATH/include" LDFLAGS="-L$LIBBSDPATH/lib"
|
CFLAGS="-I$LIBBSDPATH/include" LDFLAGS="-L$LIBBSDPATH/lib"
|
||||||
make install PREFIX="" DESTDIR=$pkg
|
make install PREFIX="" DESTDIR=$pkg
|
||||||
|
|
||||||
|
|
|
@ -17,8 +17,7 @@ prepbuilddir() {
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
./configure \
|
./configure \
|
||||||
--prefix="" \
|
--prefix=""
|
||||||
--sysconfdir=/etc
|
|
||||||
|
|
||||||
make
|
make
|
||||||
make install DESTDIR=$pkg
|
make install DESTDIR=$pkg
|
||||||
|
|
|
@ -20,7 +20,7 @@ prepbuilddir() {
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
make all syslog_tst CC="$CC -static"
|
make all syslog_tst CC+=" -static"
|
||||||
|
|
||||||
# install binaries
|
# install binaries
|
||||||
install -Dm 755 klogd $pkg/bin/klogd
|
install -Dm 755 klogd $pkg/bin/klogd
|
||||||
|
@ -36,7 +36,7 @@ build() {
|
||||||
install -Dm 644 $srcdir/syslog.conf.new $pkg/etc/syslog.conf.new
|
install -Dm 644 $srcdir/syslog.conf.new $pkg/etc/syslog.conf.new
|
||||||
install -Dm 644 $srcdir/syslog.logrotate $pkg/etc/logrotate.d/syslog.new
|
install -Dm 644 $srcdir/syslog.logrotate $pkg/etc/logrotate.d/syslog.new
|
||||||
|
|
||||||
cp ANNOUNCE CHANGES COPYING MANIFEST NEWS README* $pkgdocs/
|
cp COPYING $pkgdocs/
|
||||||
|
|
||||||
mkdir -p $pkg/var/log
|
mkdir -p $pkg/var/log
|
||||||
for i in cron debug maillog messages secure spooler syslog ; do
|
for i in cron debug maillog messages secure spooler syslog ; do
|
||||||
|
|
Loading…
Reference in a new issue