Merge branch '3.1' into 3.2
Conflicts: libpipeline/Pkgfile man-db/Pkgfile util-linux/.footprint util-linux/.md5sum util-linux/Pkgfile
This commit is contained in:
commit
c3b7c47486
@ -1 +1 @@
|
||||
2332a96783a2e6c38a0cdf382491055f dhcpcd-6.9.2.tar.xz
|
||||
8357d023c4687d27bc6ea7964236b2a6 dhcpcd-6.9.3.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: eudev
|
||||
|
||||
name=dhcpcd
|
||||
version=6.9.2
|
||||
version=6.9.3
|
||||
release=1
|
||||
source=(http://roy.marples.name/downloads/dhcpcd/$name-$version.tar.xz)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
7ddcbf6eee4970068a0ca598fc775a75 LVM2.2.02.129.tgz
|
||||
e7ae07e413120713549cc6dd2a558c75 LVM2.2.02.130.tgz
|
||||
|
@ -1,21 +1,21 @@
|
||||
# Description: Device mapper userspace library
|
||||
# URL: http://sourceware.org/lvm2/
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
# Depends on: eudev
|
||||
# Depends on: eudev util-linux
|
||||
|
||||
name=libdevmapper
|
||||
version=1.02.106
|
||||
release=2
|
||||
source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.2.02.129.tgz)
|
||||
version=1.02.107
|
||||
release=1
|
||||
source=(http://mirrors.kernel.org/sources.redhat.com/lvm2/LVM2.2.02.130.tgz)
|
||||
|
||||
build() {
|
||||
cd LVM2.2.02.129
|
||||
cd LVM2.2.02.130
|
||||
|
||||
# needed for static linking with eudev
|
||||
export UDEV_LIBS="$(pkg-config --libs --static libudev)"
|
||||
|
||||
# needed for static linking
|
||||
export LIBS="-lpthread -luuid"
|
||||
export LIBS="-lpthread -luuid -lm"
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--exec-prefix= \
|
||||
@ -38,9 +38,4 @@ build() {
|
||||
|
||||
# pkgconfig insists on /lib one or the other way...
|
||||
sed -i '/^libdir=/s|${exec_prefix}|/usr|' $PKG/usr/lib/pkgconfig/devmapper.pc
|
||||
|
||||
# fix pkg-config file
|
||||
# https://git.fedorahosted.org/cgit/lvm2.git/commit/?id=fc35b6988d65fe3f11a3f668cd8f01fe3294b562
|
||||
sed -i '/^Requires/s/librt//' $PKG/usr/lib/pkgconfig/devmapper.pc
|
||||
echo 'Libs.private: -lm -lrt' >> $PKG/usr/lib/pkgconfig/devmapper.pc
|
||||
}
|
||||
|
@ -3,9 +3,9 @@ drwxr-xr-x root/root usr/include/
|
||||
-rw-r--r-- root/root usr/include/pipeline.h
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
-rwxr-xr-x root/root usr/lib/libpipeline.la
|
||||
lrwxrwxrwx root/root usr/lib/libpipeline.so -> libpipeline.so.1.4.0
|
||||
lrwxrwxrwx root/root usr/lib/libpipeline.so.1 -> libpipeline.so.1.4.0
|
||||
-rwxr-xr-x root/root usr/lib/libpipeline.so.1.4.0
|
||||
lrwxrwxrwx root/root usr/lib/libpipeline.so -> libpipeline.so.1.4.1
|
||||
lrwxrwxrwx root/root usr/lib/libpipeline.so.1 -> libpipeline.so.1.4.1
|
||||
-rwxr-xr-x root/root usr/lib/libpipeline.so.1.4.1
|
||||
drwxr-xr-x root/root usr/lib/pkgconfig/
|
||||
-rw-r--r-- root/root usr/lib/pkgconfig/libpipeline.pc
|
||||
drwxr-xr-x root/root usr/share/
|
||||
|
@ -1 +1 @@
|
||||
660f4ac9340834a231d1516746d03d28 libpipeline-1.4.0.tar.gz
|
||||
e54590ec68d6c1239f67b5b44e92022c libpipeline-1.4.1.tar.gz
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
|
||||
name=libpipeline
|
||||
version=1.4.0
|
||||
release=2
|
||||
version=1.4.1
|
||||
release=1
|
||||
source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.gz)
|
||||
|
||||
build() {
|
||||
|
@ -15,12 +15,12 @@ drwxr-xr-x root/root usr/etc/
|
||||
-rw-r--r-- root/root usr/etc/man_db.conf
|
||||
drwxr-xr-x root/root usr/lib/
|
||||
drwxr-xr-x root/root usr/lib/man-db/
|
||||
-rwxr-xr-x root/root usr/lib/man-db/libman-2.7.1.so
|
||||
-rwxr-xr-x root/root usr/lib/man-db/libman-2.7.2.so
|
||||
-rwxr-xr-x root/root usr/lib/man-db/libman.la
|
||||
lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.7.1.so
|
||||
-rwxr-xr-x root/root usr/lib/man-db/libmandb-2.7.1.so
|
||||
lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.7.2.so
|
||||
-rwxr-xr-x root/root usr/lib/man-db/libmandb-2.7.2.so
|
||||
-rwxr-xr-x root/root usr/lib/man-db/libmandb.la
|
||||
lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.7.1.so
|
||||
lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.7.2.so
|
||||
drwxr-xr-x root/root usr/lib/man-db/man-db/
|
||||
-rwxr-xr-x root/root usr/lib/man-db/man-db/globbing
|
||||
-rwxr-xr-x root/root usr/lib/man-db/man-db/manconv
|
||||
|
@ -1,2 +1,2 @@
|
||||
88d32360e2ed18e05de9b528ad336fd8 man-db-2.7.1.tar.xz
|
||||
4b9480e4f1da04abb22ae7a9345ace6b man-db-2.7.2.tar.xz
|
||||
43dcb76783c4b2f0578b43a43124f9e9 mandb.cron
|
||||
|
@ -4,8 +4,8 @@
|
||||
# Depends on: zlib gdbm libpipeline
|
||||
|
||||
name=man-db
|
||||
version=2.7.1
|
||||
release=2
|
||||
version=2.7.2
|
||||
release=1
|
||||
source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.xz \
|
||||
mandb.cron)
|
||||
|
||||
|
@ -1 +1 @@
|
||||
2fbd1d2a3f856155dd3231c2a61c2e98 util-linux-2.27-rc2.tar.xz
|
||||
5b06bbda9309624ee7add15bc8d8ca22 util-linux-2.27.tar.xz
|
||||
|
@ -4,7 +4,7 @@
|
||||
# Depends on: eudev ncurses zlib
|
||||
|
||||
name=util-linux
|
||||
version=2.27-rc2
|
||||
version=2.27
|
||||
release=1
|
||||
source=(https://www.kernel.org/pub/linux/utils/$name/v2.27/$name-$version.tar.xz)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user