pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/devel/libatomic-links



Module Name:    pkgsrc
Committed By:   riastradh
Date:           Sat Jan 25 09:49:33 UTC 2025

Modified Files:
        pkgsrc/devel/libatomic-links: Makefile

Log Message:
devel/libatomic-links: Use relative symlinks.

This way they work when cross-compiling too.  For example, instead of

/usr/obj/dest/usr/pkg/lib/libatomic/libatomic.so -> /usr/pkg/lib/libatomic.so

we have

/usr/obj/dest/usr/pkg/lib/libatomic/libatomic.so -> ../libatomic.so

so that when the linker is run with

--sysroot=/usr/obj/dest -L/usr/pkg/lib/libatomic -latomic

it will actually find something.

Out of paranoia, add a warning in case the targets aren't under
${PREFIX}/lib as we expect.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libatomic-links/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libatomic-links/Makefile
diff -u pkgsrc/devel/libatomic-links/Makefile:1.4 pkgsrc/devel/libatomic-links/Makefile:1.5
--- pkgsrc/devel/libatomic-links/Makefile:1.4   Sat Jan 11 11:00:13 2025
+++ pkgsrc/devel/libatomic-links/Makefile       Sat Jan 25 09:49:33 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2025/01/11 11:00:13 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2025/01/25 09:49:33 riastradh Exp $
 
-PKGNAME=               libatomic-links-1.0
+PKGNAME=               libatomic-links-1.1
 CATEGORIES=            devel
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
@@ -36,9 +36,15 @@ do-patch:
 # Only needed here so far; need stems from rust which wants -latomic
 # but rust most probably should not always search /usr/pkg/lib
 do-install:
+       ${RUN} \
        for f in $$(${PKG_INFO} -q -L libatomic); do \
-               b=$$(basename $$f); \
-               ${LN} -s -f $$f ${DESTDIR}${PREFIX}/lib/libatomic/$$b; \
+               case $$f in \
+               ${PREFIX}/lib/*) \
+                       f=../$${f#${PREFIX}/lib/};; \
+               *) \
+                       printf 'warning: non-lib symlink: %s\n' $$f >&2; \
+               esac; \
+               ${LN} -s -f $$f ${DESTDIR}${PREFIX}/lib/libatomic/; \
        done
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index