pkgsrc-WIP-changes archive

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

frida-gum: Fix more linkage (lz, lelf)



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Thu Mar 15 05:07:34 2018 +0100
Changeset:	5fc272c3be125769b3d0b3e0550ba0f16bc48d93

Modified Files:
	frida-gum/Makefile
	frida-gum/distinfo
	frida-gum/patches/patch-gum_backend-netbsd_gummemory-netbsd.c
	frida-gum/patches/patch-gum_backend-netbsd_gumnetbsd.h
	frida-gum/patches/patch-gum_backend-netbsd_gumprocess-netbsd.c
	frida-gum/patches/patch-libs_gum_prof_gumbusycyclesampler-netbsd.c
Added Files:
	frida-gum/patches/patch-meson.build

Log Message:
frida-gum: Fix more linkage (lz, lelf)

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

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

diffstat:
 frida-gum/Makefile                                        |  9 +++++++++
 frida-gum/distinfo                                        |  9 +++++----
 .../patches/patch-gum_backend-netbsd_gummemory-netbsd.c   |  2 +-
 frida-gum/patches/patch-gum_backend-netbsd_gumnetbsd.h    |  2 +-
 .../patches/patch-gum_backend-netbsd_gumprocess-netbsd.c  |  2 +-
 .../patch-libs_gum_prof_gumbusycyclesampler-netbsd.c      |  2 +-
 frida-gum/patches/patch-meson.build                       | 15 +++++++++++++++
 7 files changed, 33 insertions(+), 8 deletions(-)

diffs:
diff --git a/frida-gum/Makefile b/frida-gum/Makefile
index 9735590529..5f35ab504c 100644
--- a/frida-gum/Makefile
+++ b/frida-gum/Makefile
@@ -31,6 +31,15 @@ IGNORE_PKG.glib2=	yes
 IGNORE_PKG.libffi=	yes
 IGNORE_PKG.capstone=	yes
 
+_PKG_CONFIG_LIBDIR=	${BUILDLINK_DIR}/lib/pkgconfig:${BUILDLINK_DIR}/share/pkgconfig:${BUILDLINK_DIR}/frida/lib/pkgconfig
+
+# Pass RPATH out of standard prefix
+LDFLAGS+=			${COMPILER_RPATH_FLAG}${PREFIX}/frida/lib
+
+# Allow RPATH out of standard prefix
+BUILDLINK_PASSTHRU_DIRS+=	${PREFIX}/frida
+BUILDLINK_PASSTHRU_RPATHDIRS+=	${PREFIX}/frida
+
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../wip/frida-capstone/buildlink3.mk"
diff --git a/frida-gum/distinfo b/frida-gum/distinfo
index cd7456727f..d1033fbf1d 100644
--- a/frida-gum/distinfo
+++ b/frida-gum/distinfo
@@ -6,12 +6,13 @@ SHA512 (frida-gum-0-c41abae2a2b29de3aad7a4fd9daac3e0b150cb54.tar.gz) = 607c5319c
 Size (frida-gum-0-c41abae2a2b29de3aad7a4fd9daac3e0b150cb54.tar.gz) = 12573451 bytes
 SHA1 (patch-config.h.in) = 9d7f701ba8577e6501e4d64e80adef397255e46a
 SHA1 (patch-gum_backend-elf_gumelfmodule.c) = b30c4e1ac7e9deefe530cc11aebc50233e5af8f6
-SHA1 (patch-gum_backend-netbsd_gummemory-netbsd.c) = c6b4c3eba22792372994f3562685b1ba528e798c
-SHA1 (patch-gum_backend-netbsd_gumnetbsd.h) = 329724432e7a3184f7a41e0c3bf855d567e0108a
-SHA1 (patch-gum_backend-netbsd_gumprocess-netbsd.c) = 9c606dc1aca890afb7cf04a9936690e33350fd0a
+SHA1 (patch-gum_backend-netbsd_gummemory-netbsd.c) = bb2c9c1597ffd127935d4a95425c19f86a8e970e
+SHA1 (patch-gum_backend-netbsd_gumnetbsd.h) = 4d2e92dce09e162dc020e913f3d1f8783f581e86
+SHA1 (patch-gum_backend-netbsd_gumprocess-netbsd.c) = d267fe6159596069b5dfe6becd90d44720421f98
 SHA1 (patch-gum_backend-posix_gummemory-posix.c) = dcbfb08821ac1cb0fedf672e409c5289fbc594bd
 SHA1 (patch-gum_gumdefs.h) = cb24f98c906572196228ee0d09c2cd2dcaa5c306
 SHA1 (patch-gum_gumprocess.c) = 915a233f242186a45b375ef2690cf534d8ad39f2
 SHA1 (patch-gum_meson.build) = 24f1b2351a48058e8305daac00c422088fad25ff
-SHA1 (patch-libs_gum_prof_gumbusycyclesampler-netbsd.c) = 646be4562b4f68303321de166b10edfd54f09299
+SHA1 (patch-libs_gum_prof_gumbusycyclesampler-netbsd.c) = 2fad7c8e1feaa243b2dafc63f74d1b5d1430f5ec
 SHA1 (patch-libs_gum_prof_meson.build) = c3728d856ea8871714679c028844f827b47282d0
+SHA1 (patch-meson.build) = 35def371e4561904c96d386f70e4fbe8ab5cb5ef
diff --git a/frida-gum/patches/patch-gum_backend-netbsd_gummemory-netbsd.c b/frida-gum/patches/patch-gum_backend-netbsd_gummemory-netbsd.c
index e42bb5d248..d441e651de 100644
--- a/frida-gum/patches/patch-gum_backend-netbsd_gummemory-netbsd.c
+++ b/frida-gum/patches/patch-gum_backend-netbsd_gummemory-netbsd.c
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- gum/backend-netbsd/gummemory-netbsd.c.orig	2018-03-15 03:39:53.659846942 +0000
+--- gum/backend-netbsd/gummemory-netbsd.c.orig	2018-03-15 03:53:19.204426671 +0000
 +++ gum/backend-netbsd/gummemory-netbsd.c
 @@ -0,0 +1,71 @@
 +/*
diff --git a/frida-gum/patches/patch-gum_backend-netbsd_gumnetbsd.h b/frida-gum/patches/patch-gum_backend-netbsd_gumnetbsd.h
index bdfc0081a8..9f85f395dd 100644
--- a/frida-gum/patches/patch-gum_backend-netbsd_gumnetbsd.h
+++ b/frida-gum/patches/patch-gum_backend-netbsd_gumnetbsd.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- gum/backend-netbsd/gumnetbsd.h.orig	2018-03-15 03:39:53.666438410 +0000
+--- gum/backend-netbsd/gumnetbsd.h.orig	2018-03-15 03:53:19.210983649 +0000
 +++ gum/backend-netbsd/gumnetbsd.h
 @@ -0,0 +1,29 @@
 +/*
diff --git a/frida-gum/patches/patch-gum_backend-netbsd_gumprocess-netbsd.c b/frida-gum/patches/patch-gum_backend-netbsd_gumprocess-netbsd.c
index 942c98bdc5..9a23f37259 100644
--- a/frida-gum/patches/patch-gum_backend-netbsd_gumprocess-netbsd.c
+++ b/frida-gum/patches/patch-gum_backend-netbsd_gumprocess-netbsd.c
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- gum/backend-netbsd/gumprocess-netbsd.c.orig	2018-03-15 03:39:53.673565915 +0000
+--- gum/backend-netbsd/gumprocess-netbsd.c.orig	2018-03-15 03:53:19.217712887 +0000
 +++ gum/backend-netbsd/gumprocess-netbsd.c
 @@ -0,0 +1,633 @@
 +/*
diff --git a/frida-gum/patches/patch-libs_gum_prof_gumbusycyclesampler-netbsd.c b/frida-gum/patches/patch-libs_gum_prof_gumbusycyclesampler-netbsd.c
index c5b1c1ebc5..3a204a24ba 100644
--- a/frida-gum/patches/patch-libs_gum_prof_gumbusycyclesampler-netbsd.c
+++ b/frida-gum/patches/patch-libs_gum_prof_gumbusycyclesampler-netbsd.c
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- libs/gum/prof/gumbusycyclesampler-netbsd.c.orig	2018-03-15 03:39:53.700265712 +0000
+--- libs/gum/prof/gumbusycyclesampler-netbsd.c.orig	2018-03-15 03:53:19.250967215 +0000
 +++ libs/gum/prof/gumbusycyclesampler-netbsd.c
 @@ -0,0 +1,60 @@
 +/*
diff --git a/frida-gum/patches/patch-meson.build b/frida-gum/patches/patch-meson.build
new file mode 100644
index 0000000000..cbeb25263b
--- /dev/null
+++ b/frida-gum/patches/patch-meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- meson.build.orig	2018-03-12 19:53:33.000000000 +0000
++++ meson.build
+@@ -168,6 +168,10 @@ else
+   have_libdwarf = false
+ endif
+ 
++if host_os_family == 'netbsd'
++  extra_libs_private += ['-lelf', '-lz']
++endif
++
+ if get_option('enable_gumpp')
+   cdata.set('HAVE_GUMPP', 1)
+ endif


Home | Main Index | Thread Index | Old Index