[ptxdist] [PATCH v2] libgmp: always build shared library

[ptxdist] [PATCH v2] libgmp: always build shared library

[Alexander Aring]

This patch drops the config for shared or static library build of
libgmp. Instead we build always libgmp as a shared library.

This fix also an issue with a missing -fPIC if we build the static library.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
changes since v2:
 - remove the rest of patches from the other series since we are sure we can
   drop the static library support. This makes the handling of libraries
   much easier.

 rules/libgmp.in   | 20 +-------------------
 rules/libgmp.make | 10 +++-------
 2 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/rules/libgmp.in b/rules/libgmp.in
index b7127f3..ec063ad 100644
--- a/rules/libgmp.in
+++ b/rules/libgmp.in
@@ -2,28 +2,10 @@
 #
 # rules/libgmp.in
 #
-menuconfig LIBGMP
+config LIBGMP
 	tristate
 	prompt "libgmp                        "
 	help
 	  Compiles the GNU Multiprecision libraries for your target system.
 
           See http://gmplib.org/ for info about it.
-
-if LIBGMP
-
-config LIBGMP_SHARED
-	bool
-	default y
-	prompt "Create shared library"
-	help
-	  Create a shared library and install it into /usr/lib
-
-config LIBGMP_STATIC
-	bool
-	prompt "Create static link library"
-	help
-	  Create a static link library and install it into /usr/lib.
-	  Normally not needed.
-
-endif
diff --git a/rules/libgmp.make b/rules/libgmp.make
index 8e3b356..3c6b01c 100644
--- a/rules/libgmp.make
+++ b/rules/libgmp.make
@@ -38,8 +38,8 @@ LIBGMP_ENV 	:= $(CROSS_ENV)
 #
 LIBGMP_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--$(call ptx/endis, PTXCONF_LIBGMP_SHARED)-shared \
-	--$(call ptx/endis, PTXCONF_LIBGMP_STATIC)-static
+	--enable-shared \
+	--disable-static
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -54,12 +54,8 @@ $(STATEDIR)/libgmp.targetinstall:
 	@$(call install_fixup, libgmp,AUTHOR,"Carsten Schlote <c.schlote@konzeptpark.de>")
 	@$(call install_fixup, libgmp,DESCRIPTION,missing)
 
-ifdef PTXCONF_LIBGMP_SHARED
 	@$(call install_lib, libgmp, 0, 0, 0644, libgmp)
-endif
-ifdef PTXCONF_LIBGMP_STATIC
-	@$(call install_copy, libgmp, 0, 0, 0644, -, /usr/lib/libgmp.la)
-endif
+	
 	@$(call install_finish, libgmp)
 
 	@$(call touch)
-- 
1.9.1


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] libgmp: always build shared library

[Michael Olbrich]

On Fri, Mar 21, 2014 at 10:35:09AM +0100, Alexander Aring wrote:
> This patch drops the config for shared or static library build of
> libgmp. Instead we build always libgmp as a shared library.
> 
> This fix also an issue with a missing -fPIC if we build the static library.
> 
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>
> ---
> changes since v2:
>  - remove the rest of patches from the other series since we are sure we can
>    drop the static library support. This makes the handling of libraries
>    much easier.

Thanks, applied, with some cleanups.

Michael

> 
>  rules/libgmp.in   | 20 +-------------------
>  rules/libgmp.make | 10 +++-------
>  2 files changed, 4 insertions(+), 26 deletions(-)
> 
> diff --git a/rules/libgmp.in b/rules/libgmp.in
> index b7127f3..ec063ad 100644
> --- a/rules/libgmp.in
> +++ b/rules/libgmp.in
> @@ -2,28 +2,10 @@
>  #
>  # rules/libgmp.in
>  #
> -menuconfig LIBGMP
> +config LIBGMP
>  	tristate
>  	prompt "libgmp                        "
>  	help
>  	  Compiles the GNU Multiprecision libraries for your target system.
>  
>            See http://gmplib.org/ for info about it.
> -
> -if LIBGMP
> -
> -config LIBGMP_SHARED
> -	bool
> -	default y
> -	prompt "Create shared library"
> -	help
> -	  Create a shared library and install it into /usr/lib
> -
> -config LIBGMP_STATIC
> -	bool
> -	prompt "Create static link library"
> -	help
> -	  Create a static link library and install it into /usr/lib.
> -	  Normally not needed.
> -
> -endif
> diff --git a/rules/libgmp.make b/rules/libgmp.make
> index 8e3b356..3c6b01c 100644
> --- a/rules/libgmp.make
> +++ b/rules/libgmp.make
> @@ -38,8 +38,8 @@ LIBGMP_ENV 	:= $(CROSS_ENV)
>  #
>  LIBGMP_AUTOCONF := \
>  	$(CROSS_AUTOCONF_USR) \
> -	--$(call ptx/endis, PTXCONF_LIBGMP_SHARED)-shared \
> -	--$(call ptx/endis, PTXCONF_LIBGMP_STATIC)-static
> +	--enable-shared \
> +	--disable-static
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install
> @@ -54,12 +54,8 @@ $(STATEDIR)/libgmp.targetinstall:
>  	@$(call install_fixup, libgmp,AUTHOR,"Carsten Schlote <c.schlote@konzeptpark.de>")
>  	@$(call install_fixup, libgmp,DESCRIPTION,missing)
>  
> -ifdef PTXCONF_LIBGMP_SHARED
>  	@$(call install_lib, libgmp, 0, 0, 0644, libgmp)
> -endif
> -ifdef PTXCONF_LIBGMP_STATIC
> -	@$(call install_copy, libgmp, 0, 0, 0644, -, /usr/lib/libgmp.la)
> -endif
> +	
>  	@$(call install_finish, libgmp)
>  
>  	@$(call touch)
> -- 
> 1.9.1
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de