pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
(ham/wsjtx) Trying to add FreeBSD (equivalent) patch (failing)
Module Name: pkgsrc-wip
Committed By: Makoto Fujiwara (mef) <makoto%ki.nu@localhost>
Pushed By: mef
Date: Fri Mar 26 08:18:52 2021 +0900
Changeset: bde76ef39e8d13ea4daf3d0327c8bdb7b27b4f44
Modified Files:
wsjt/Makefile
wsjt/distinfo
Added Files:
wsjt/patches/patch-hamlib.patch
Log Message:
(ham/wsjtx) Trying to add FreeBSD (equivalent) patch (failing)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bde76ef39e8d13ea4daf3d0327c8bdb7b27b4f44
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
wsjt/Makefile | 17 ++++++++++++++---
wsjt/distinfo | 1 +
wsjt/patches/patch-hamlib.patch | 39 +++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 3 deletions(-)
diffs:
diff --git a/wsjt/Makefile b/wsjt/Makefile
index 8411326566..64d7a85fdc 100644
--- a/wsjt/Makefile
+++ b/wsjt/Makefile
@@ -22,13 +22,24 @@ CMAKE_ARGS+= -D CMAKE_INSTALL_PREFIX=${DESTDIR}${PREFIX}
CMAKE_ARGS+= -DWSJT_SKIP_MANPAGES=ON
CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX}/qt5
CMAKE_ARGS+= -DWSJT_GENERATE_DOCS=OFF
+CMAKE_ARGS+= -DLDFLAGS='-L${PREFIX}/lib -lusb-1.0'
+CMAKE_ARGS+= -DLDFLAGS=-Wl,-rpath-link=-L${PREFIX}/lib -lusb-1.0
-#LDFLAGS+= -L${PREFIX}/lib -lusb-1.0
+LDFLAGS+= ${COMPILER_RPATH_FLAG}=-L${PREFIX}/lib -lusb-1.0
+#DFLAGS+= --rpath,-Wl=-lusb-1.0
#MAKE_ENV+= LIBUSB_FLAGS='-L${PREFIX}/lib -lusb-1.0'
# debug only (checking log)
MAKE_JOBS_SAFE= no
+# hamlib-prefix/src/hamlib/configure.ac
+SUBST_CLASSES+= hamlib
+SUBST_FILES.hamlib= hamlib.patch
+SUBST_STAGE.hamlib= pre-configure
+SUBST_MESSAGE.hamlib= fix PREFIX insid patch
+SUBST_VARS.hamlib= PREFIX
+
+
.include "../../graphics/openexr/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../x11/qt5-qtbase/buildlink3.mk"
@@ -39,7 +50,7 @@ MAKE_JOBS_SAFE= no
.include "../../mk/pthread.buildlink3.mk"
#include "../../devel/libusb1/buildlink3.mk"
.include "../../mk/libusb.buildlink3.mk"
-#BUILDLINK_API_DEPENDS.hamlib+= hamlib>=4.1
-#.include "../../ham/hamlib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.hamlib+= hamlib>=4.1
+.include "../../ham/hamlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wsjt/distinfo b/wsjt/distinfo
index 4f2fd53a11..b5bc8bc5e5 100644
--- a/wsjt/distinfo
+++ b/wsjt/distinfo
@@ -4,3 +4,4 @@ SHA1 (wsjtx-2.3.0.tgz) = 2caae6d1b74d31cd7f6bc507dd15f8cfd17c2ffb
RMD160 (wsjtx-2.3.0.tgz) = 9f5dc6c80551e4a70f90671b8d5be7b070e41916
SHA512 (wsjtx-2.3.0.tgz) = 1b521a7c81d235b2f17b2a314528f5f9fc8b29de95a2f7f5471104866ff13d138f9913666bc00de71f34ed16e692f0f4b93c878cc3538d30a52852e4c179702c
Size (wsjtx-2.3.0.tgz) = 17245200 bytes
+SHA1 (patch-hamlib.patch) = 00030082f8e9b5d37879c46e1e7d73ba5a2bf2b3
diff --git a/wsjt/patches/patch-hamlib.patch b/wsjt/patches/patch-hamlib.patch
new file mode 100644
index 0000000000..b2897f18dc
--- /dev/null
+++ b/wsjt/patches/patch-hamlib.patch
@@ -0,0 +1,39 @@
+$NetBSD$
+
+
+patch PREFIX inside patch
+
+--- /dev/null 2021-03-22 22:25:49.591851345 +0900
++++ /tmp/WRKOBJDIR/wip/wsjt/work/wsjtx-2.3.0/hamlib.patch 2021-03-22 23:15:53.147421908 +0900
+@@ -0,0 +1,31 @@
++--- hamlib-prefix/src/hamlib/hamlib.pc.in.orig 2021-02-01 21:35:36.000000000 +0900
+++++ hamlib/hamlib.pc.in 2021-03-21 21:07:31.473290128 +0900
++@@ -9,5 +9,5 @@ URL: @PACKAGE_URL@
++ Version: @PACKAGE_VERSION@
++ Requires.private: @LIBUSB@
++ Cflags: -I${includedir} @PTHREAD_CFLAGS@
++-Libs: -L${libdir} -lhamlib
+++Libs: -L${libdir} ${libdir}/libhamlib.a
++ Libs.private: @MATH_LIBS@ @DL_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@
++--- hamlib-prefix/src/hamlib/configure.ac.orig 2021-02-01 21:35:36.000000000 +0900
+++++ hamlib/configure.ac 2021-03-21 21:03:16.858039431 +0900
++@@ -278,6 +278,11 @@ AS_CASE(["$host_os"],
++ AM_LDFLAGS="${AM_LDFLAGS} -L/usr/local/lib"
++ AC_SUBST([AM_LDFLAGS])],
++
+++ [netbsd*], [
+++ AM_CPPFLAGS="${AM_CPPFLAGS} -I@PREFIX@/include"
+++ AM_LDFLAGS="${AM_LDFLAGS} -L@PREFIX@/lib -lusb-1.0"
+++ AC_SUBST([AM_LDFLAGS])],
+++
++ [darwin* | rhapsody*], [
++ # Tell the OS X linker to allocate enough space inside the
++ # libhamlib.X.dylib shared object for install_name_tool(1) to
++@@ -321,6 +326,7 @@ AC_ARG_WITH([libusb],
++
++ AC_MSG_RESULT([$cf_with_libusb])
++
+++LIBUSB="-L@PREFIX@/lib -lusb-1.0"
++ LIBUSB=""
++ AC_ARG_VAR([LIBUSB_CFLAGS], [C compiler flags for libusb, overriding configure defaults])
++ AC_ARG_VAR([LIBUSB_LIBS], [linker flags for libusb, overriding configure check (useful for specifying static libusb-1.0.a (see INSTALL))])
Home |
Main Index |
Thread Index |
Old Index