Subject: Re: Issues with pkgsrc on IRIX
To: Staffan =?iso-8859-1?Q?Thom=E9n?= <duck@knightrider.shangtai.net>
From: Jan Schaumann <jschauma@netmeister.org>
List: tech-pkg
Date: 01/01/2006 23:02:58
--Pd0ReVV5GZGQvF3a
Content-Type: multipart/mixed; boundary="6c2NcOVqGQ03X4Wi"
Content-Disposition: inline
--6c2NcOVqGQ03X4Wi
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Staffan Thom=E9n <duck@knightrider.shangtai.net> wrote:
=20
> Yes, only one ABI at a time, but the problem is that in .buildlink you g=
et
> two directories for libraries, lib32 with the system libraries and lib w=
ith
> pkgsrc libraries e.g;
>=20
> $WORKDIR/.buildlink/lib
> libintl.so
> ...
>=20
> $WORKDIR/.buildlink/lib32
> libpthread.so
> ...
>=20
> buildlink will however only pass on one path to the linker; usually
> -L$WORKDIR/.buildlink/lib32 thus causing breakage. I suppose it's simply
> because the source directories are named lib32 and lib respectively--mov=
ing
> the symlinks inside these directories to only lib32 works, but then brea=
ks
> because e.g. $WORKDIR/.buildlink/lib/pkgconfig is accessed...
Maybe try the attached patch -- this way, both lib and lib32 are
buildlink passed.
-Jan
--=20
Wenn ich tot bin, mir soll mal Einer mit Auferstehung oder so
kommen, ich hau ihm eine rein! (Anonym)
--6c2NcOVqGQ03X4Wi
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=diff
Index: bsd.buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/buildlink3/bsd.buildlink3.mk,v
retrieving revision 1.171
diff -b -u -r1.171 bsd.buildlink3.mk
--- bsd.buildlink3.mk 1 Jun 2005 18:03:06 -0000 1.171
+++ bsd.buildlink3.mk 2 Jan 2006 03:59:54 -0000
@@ -337,7 +337,10 @@
BUILDLINK_LDFLAGS.${_pkg_}?= # empty
BUILDLINK_LIBS.${_pkg_}?= # empty
BUILDLINK_INCDIRS.${_pkg_}?= include
-BUILDLINK_LIBDIRS.${_pkg_}?= lib${LIBABISUFFIX}
+BUILDLINK_LIBDIRS.${_pkg_}?= lib
+.if !empty(LIBABISUFFIX)
+BUILDLINK_LIBDIRS.${_pkg_}+= lib${LIBABISUFFIX}
+.endif
. if !empty(BUILDLINK_DEPMETHOD.${_pkg_}:Mfull)
BUILDLINK_RPATHDIRS.${_pkg_}?= ${BUILDLINK_LIBDIRS.${_pkg_}}
. else
--6c2NcOVqGQ03X4Wi--
--Pd0ReVV5GZGQvF3a
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (NetBSD)
iD8DBQFDuKXyfFtkr68iakwRAgkGAJ9HLgWoDbdZbL0LEjHUZIcYNst5fwCePwXK
wkT+fdVWNvRAKT58dfHjJ3A=
=8r31
-----END PGP SIGNATURE-----
--Pd0ReVV5GZGQvF3a--