commit 3188225a110c1a3ef6beebac3c2796e514f442e3 Author: Matt Housh <jaeger@crux.ninja> Date: Mon Oct 3 12:32:37 2022 -0500 [notify] libbsd: moved to nonstandard path in hopes of avoiding eager linking See the README for info and please feel free to report any issues discovered. diff --git a/libbsd/.footprint b/libbsd/.footprint index d57c97179..4d3cf9a11 100644 --- a/libbsd/.footprint +++ b/libbsd/.footprint @@ -1,47 +1,52 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/ld.so.conf.d/ +-rw-r--r-- root/root etc/ld.so.conf.d/libbsd.conf drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/bsd/ --rw-r--r-- root/root usr/include/bsd/bitstring.h --rw-r--r-- root/root usr/include/bsd/bsd.h --rw-r--r-- root/root usr/include/bsd/err.h --rw-r--r-- root/root usr/include/bsd/getopt.h --rw-r--r-- root/root usr/include/bsd/grp.h --rw-r--r-- root/root usr/include/bsd/inttypes.h --rw-r--r-- root/root usr/include/bsd/libutil.h --rw-r--r-- root/root usr/include/bsd/md5.h -drwxr-xr-x root/root usr/include/bsd/netinet/ --rw-r--r-- root/root usr/include/bsd/netinet/ip_icmp.h --rw-r--r-- root/root usr/include/bsd/nlist.h --rw-r--r-- root/root usr/include/bsd/pwd.h --rw-r--r-- root/root usr/include/bsd/readpassphrase.h --rw-r--r-- root/root usr/include/bsd/stdio.h --rw-r--r-- root/root usr/include/bsd/stdlib.h --rw-r--r-- root/root usr/include/bsd/string.h --rw-r--r-- root/root usr/include/bsd/stringlist.h -drwxr-xr-x root/root usr/include/bsd/sys/ --rw-r--r-- root/root usr/include/bsd/sys/bitstring.h --rw-r--r-- root/root usr/include/bsd/sys/cdefs.h --rw-r--r-- root/root usr/include/bsd/sys/endian.h --rw-r--r-- root/root usr/include/bsd/sys/param.h --rw-r--r-- root/root usr/include/bsd/sys/poll.h --rw-r--r-- root/root usr/include/bsd/sys/queue.h --rw-r--r-- root/root usr/include/bsd/sys/time.h --rw-r--r-- root/root usr/include/bsd/sys/tree.h --rw-r--r-- root/root usr/include/bsd/timeconv.h --rw-r--r-- root/root usr/include/bsd/unistd.h --rw-r--r-- root/root usr/include/bsd/vis.h --rw-r--r-- root/root usr/include/bsd/wchar.h -drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libbsd-ctor.a --rw-r--r-- root/root usr/lib/libbsd.a --rwxr-xr-x root/root usr/lib/libbsd.la --rw-r--r-- root/root usr/lib/libbsd.so -lrwxrwxrwx root/root usr/lib/libbsd.so.0 -> libbsd.so.0.11.6 --rwxr-xr-x root/root usr/lib/libbsd.so.0.11.6 -drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/libbsd-ctor.pc --rw-r--r-- root/root usr/lib/pkgconfig/libbsd-overlay.pc --rw-r--r-- root/root usr/lib/pkgconfig/libbsd.pc +drwxr-xr-x root/root usr/opt/ +drwxr-xr-x root/root usr/opt/libbsd/ +drwxr-xr-x root/root usr/opt/libbsd/include/ +drwxr-xr-x root/root usr/opt/libbsd/include/bsd/ +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/bitstring.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/bsd.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/err.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/getopt.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/grp.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/inttypes.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/libutil.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/md5.h +drwxr-xr-x root/root usr/opt/libbsd/include/bsd/netinet/ +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/netinet/ip_icmp.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/nlist.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/pwd.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/readpassphrase.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/stdio.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/stdlib.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/string.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/stringlist.h +drwxr-xr-x root/root usr/opt/libbsd/include/bsd/sys/ +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/sys/bitstring.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/sys/cdefs.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/sys/endian.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/sys/param.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/sys/poll.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/sys/queue.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/sys/time.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/sys/tree.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/timeconv.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/unistd.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/vis.h +-rw-r--r-- root/root usr/opt/libbsd/include/bsd/wchar.h +drwxr-xr-x root/root usr/opt/libbsd/lib/ +-rw-r--r-- root/root usr/opt/libbsd/lib/libbsd-ctor.a +-rw-r--r-- root/root usr/opt/libbsd/lib/libbsd.a +-rwxr-xr-x root/root usr/opt/libbsd/lib/libbsd.la +-rw-r--r-- root/root usr/opt/libbsd/lib/libbsd.so +lrwxrwxrwx root/root usr/opt/libbsd/lib/libbsd.so.0 -> libbsd.so.0.11.6 +-rwxr-xr-x root/root usr/opt/libbsd/lib/libbsd.so.0.11.6 +drwxr-xr-x root/root usr/opt/libbsd/lib/pkgconfig/ +-rw-r--r-- root/root usr/opt/libbsd/lib/pkgconfig/libbsd-ctor.pc +-rw-r--r-- root/root usr/opt/libbsd/lib/pkgconfig/libbsd-overlay.pc +-rw-r--r-- root/root usr/opt/libbsd/lib/pkgconfig/libbsd.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man3/ diff --git a/libbsd/Pkgfile b/libbsd/Pkgfile index 84c5ca878..03916abb5 100644 --- a/libbsd/Pkgfile +++ b/libbsd/Pkgfile @@ -5,12 +5,15 @@ name=libbsd version=0.11.6 -release=1 -source=(https://libbsd.freedesktop.org/releases/$name-$version.tar.xz) +release=2 +source=(https://libbsd.freedesktop.org/releases/$name-$version.tar.xz \ + $name.conf) build() { cd $name-$version - ./configure --prefix=/usr + ./configure --prefix=/usr/opt/$name \ + --mandir=/usr/share/man make make install DESTDIR=$PKG + install -Dm0644 $SRC/$name.conf $PKG/etc/ld.so.conf.d/$name.conf } diff --git a/libbsd/README b/libbsd/README new file mode 100644 index 000000000..fdc27b0b2 --- /dev/null +++ b/libbsd/README @@ -0,0 +1,10 @@ +README for libbsd + +Due to the unusual layout of this package's libraries and headers it may be +required to set various build environment variables to allow other software +to discover libbsd, for example (alter as needed): + +CFLAGS="${CFLAGS} -I/usr/opt/libbsd/include" +LDFLAGS="${LDFLAGS" -L/usr/opt/libbsd/lib" +LD_LIBRARY_PATH="/usr/oprt/libbsd/lib" +PKG_CONFIG_PATH="/usr/opt/libbsd/lib/pkgconfig" diff --git a/libbsd/libbsd.conf b/libbsd/libbsd.conf new file mode 100644 index 000000000..605aab2fd --- /dev/null +++ b/libbsd/libbsd.conf @@ -0,0 +1 @@ +/usr/opt/libbsd/lib