pkgsrc-WIP-changes archive

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

wip/alacritty: Add my current state, still fails with runtime linking



Module Name:	pkgsrc-wip
Committed By:	ng0 <ng0%NetBSD.org@localhost>
Pushed By:	ng0
Date:		Sun Aug 25 00:13:03 2019 +0000
Changeset:	5fe3051fac6457c21031b4b7e75e0a09346a2935

Modified Files:
	alacritty/Makefile
	alacritty/distinfo
	alacritty/patches/patch-2698PR

Log Message:
wip/alacritty: Add my current state, still fails with runtime linking

missing library: libfreetype.so.19, libfontconfig.so.2 and libxcb.so.2

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5fe3051fac6457c21031b4b7e75e0a09346a2935

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

diffstat:
 alacritty/Makefile             | 19 +++++++++++++------
 alacritty/distinfo             |  2 +-
 alacritty/patches/patch-2698PR |  2 ++
 3 files changed, 16 insertions(+), 7 deletions(-)

diffs:
diff --git a/alacritty/Makefile b/alacritty/Makefile
index 7d532563d1..0a7f7b004d 100644
--- a/alacritty/Makefile
+++ b/alacritty/Makefile
@@ -299,28 +299,35 @@ CARGO_CRATE_DEPENDS+=	zip-0.5.2
 
 INSTALLATION_DIRS=	bin
 
-DEPENDS+=	xcb-[0-9]*:../../x11/xcb
+#DEPENDS+=	xcb-[0-9]*:../../x11/xcb
+
+# These are reported as missing in run-time search paths on NetBSD/amd64
+# -lxcb -lfontconfig -lfreetype
+MAKE_ENV+=	RUSTFLAGS="-L native=${BUILDLINK_PREFIX.libxcb} -L native=${BUILDLINK_PREFIX.fontconfig} -L native=${BUILDLINK_PREFIX.freetype2}"
 
 MAKE_ENV+=		OPENSSL_DIR=${BUILDLINK_PREFIX.openssl:Q}
 
-BUILD_DEPENDS+=			cmake-[0-9]*:../../devel/cmake
+BUILDLINK_TRANSFORM+=	opt:-ldl:${BUILDLINK_LDADD.dl:Q}
+
+BUILD_DEPENDS+=		cmake-[0-9]*:../../devel/cmake
 
+# The xcb 0.8.2 crate depends on any version of python 3.
 PYTHON_VERSIONS_INCOMPATIBLE=	27
 PYTHON_FOR_BUILD_ONLY=		yes
 BUILD_DEPENDS+=			${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 #REPLACE_PYTHON+=		../vendor/xcb-0.8.2/rs-client.py
 #REPLACE_PYTHON+=		../vendor/xcb-0.8.2/build.rs
 
-.include "../../lang/python/application.mk"
-
-
 do-build:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --locked --frozen --release
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo build --verbose --locked --frozen --release
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/target/release/alacritty ${DESTDIR}${PREFIX}/bin
 
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+#.include "../../graphics/freetype-lib/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../lang/rust/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/alacritty/distinfo b/alacritty/distinfo
index 75f0470c10..4c6fe21afd 100644
--- a/alacritty/distinfo
+++ b/alacritty/distinfo
@@ -1140,6 +1140,6 @@ SHA1 (zip-0.5.2.crate) = b4efe358b8267688f6e2f9ca36af9b8e764d55da
 RMD160 (zip-0.5.2.crate) = 0e4e10d7a43571fdb8926bf68bcc2728447bcb65
 SHA512 (zip-0.5.2.crate) = 4433cb75ec8bbaa946c8ffd8f1ee2f50b4117a660b850ceb5f38e688ad903979fbb4a885926cba14fac11eb8089e1155ce9041ec132be78952baa7fc4666880d
 Size (zip-0.5.2.crate) = 29522 bytes
-SHA1 (patch-2698PR) = f2e5466499899e8afb6187b24d03504d49eeb327
+SHA1 (patch-2698PR) = 4936c33f1525b10baf7d20b4fa8798f3129d45da
 SHA1 (patch-vendor_xcb-0.8.2_build_rs) = a459226fbc9600903e753e70045c588bfe3bd399
 SHA1 (patch-vendor_xcb-0.8.2_rs-client_py) = fccc10dfa3984c30adb71ed2ed6127130e6aa448
diff --git a/alacritty/patches/patch-2698PR b/alacritty/patches/patch-2698PR
index 46b4281719..880393a165 100644
--- a/alacritty/patches/patch-2698PR
+++ b/alacritty/patches/patch-2698PR
@@ -1,3 +1,5 @@
+$NetBSD$
+
 Remove errno depedency
 Fixes #2631.
 From upstream patch.


Home | Main Index | Thread Index | Old Index