Patchwork [17/18] Add osx patch for readline

login
register
mail settings
Submitter Yann Diorcet
Date Oct. 21, 2012, 3:27 p.m.
Message ID <1350833261-8401-17-git-send-email-diorcet.yann@gmail.com>
Download mbox | patch
Permalink /patch/193022/
State Accepted
Headers show

Comments

Yann Diorcet - Oct. 21, 2012, 3:27 p.m.
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>

Fix produced dynamic library on darwin
---
 recipes/readline/readline-6.2/patch-shobj-conf.patch |   12 ++++++++++++
 recipes/readline/readline_6.2.oe                     |    2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 recipes/readline/readline-6.2/patch-shobj-conf.patch
Esben Haabendal - Dec. 14, 2012, 7:53 p.m.
Yann Diorcet <diorcet.yann@gmail.com> writes:

> From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
>
> Fix produced dynamic library on darwin
> ---
>  recipes/readline/readline-6.2/patch-shobj-conf.patch |   12 ++++++++++++
>  recipes/readline/readline_6.2.oe                     |    2 ++
>  2 files changed, 14 insertions(+)
>  create mode 100644 recipes/readline/readline-6.2/patch-shobj-conf.patch
>
> diff --git a/recipes/readline/readline-6.2/patch-shobj-conf.patch b/recipes/readline/readline-6.2/patch-shobj-conf.patch
> new file mode 100644
> index 0000000..bfe3a19
> --- /dev/null
> +++ b/recipes/readline/readline-6.2/patch-shobj-conf.patch
> @@ -0,0 +1,12 @@
> +diff -urN readline-6.2/support/shobj-conf readline-6.2.mod/support/shobj-conf
> +--- readline-6.2/support/shobj-conf	2009-10-28 14:20:21.000000000 +0100
> ++++ readline-6.2.mod/support/shobj-conf	2012-10-09 12:30:52.000000000 +0200
> +@@ -190,7 +190,7 @@
> + 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
> + 			;;
> + 	*)		SHOBJ_LDFLAGS='-dynamic'
> +-			SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
> ++			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
> + 			;;
> + 	esac
> + 
> diff --git a/recipes/readline/readline_6.2.oe b/recipes/readline/readline_6.2.oe
> index 8d8fe3c..c82aac2 100644
> --- a/recipes/readline/readline_6.2.oe
> +++ b/recipes/readline/readline_6.2.oe
> @@ -1,3 +1,5 @@
>  LICENSE = "GPL-3.0+"
>  
>  require readline.inc
> +
> +SRC_URI:>TARGET_OS_darwin = " file://patch-shobj-conf.patch"

Merged to master, thanks.

/Esben

Patch

diff --git a/recipes/readline/readline-6.2/patch-shobj-conf.patch b/recipes/readline/readline-6.2/patch-shobj-conf.patch
new file mode 100644
index 0000000..bfe3a19
--- /dev/null
+++ b/recipes/readline/readline-6.2/patch-shobj-conf.patch
@@ -0,0 +1,12 @@ 
+diff -urN readline-6.2/support/shobj-conf readline-6.2.mod/support/shobj-conf
+--- readline-6.2/support/shobj-conf	2009-10-28 14:20:21.000000000 +0100
++++ readline-6.2.mod/support/shobj-conf	2012-10-09 12:30:52.000000000 +0200
+@@ -190,7 +190,7 @@
+ 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ 			;;
+ 	*)		SHOBJ_LDFLAGS='-dynamic'
+-			SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
++			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
+ 			;;
+ 	esac
+ 
diff --git a/recipes/readline/readline_6.2.oe b/recipes/readline/readline_6.2.oe
index 8d8fe3c..c82aac2 100644
--- a/recipes/readline/readline_6.2.oe
+++ b/recipes/readline/readline_6.2.oe
@@ -1,3 +1,5 @@ 
 LICENSE = "GPL-3.0+"
 
 require readline.inc
+
+SRC_URI:>TARGET_OS_darwin = " file://patch-shobj-conf.patch"