Patchwork Add libapr-package

login
register
mail settings
Submitter Rico Bachmann
Date April 17, 2012, 10:59 a.m.
Message ID <1334660370-19506-2-git-send-email-bachmann@tofwerk.com>
Download mbox | patch
Permalink /patch/153125/
State Not Applicable
Headers show

Comments

Rico Bachmann - April 17, 2012, 10:59 a.m.
Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
---
 package/Config.in        |    1 +
 package/libapr/Config.in |    7 +++++++
 package/libapr/libapr.mk |   12 ++++++++++++
 3 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 package/libapr/Config.in
 create mode 100644 package/libapr/libapr.mk
Maxime Ripard - April 17, 2012, 11:36 a.m.
Hi,

Thanks for your patch!

Le 17/04/2012 12:59, Rico Bachmann a écrit :
> Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
> ---
>  package/Config.in        |    1 +
>  package/libapr/Config.in |    7 +++++++
>  package/libapr/libapr.mk |   12 ++++++++++++
>  3 files changed, 20 insertions(+), 0 deletions(-)
>  create mode 100644 package/libapr/Config.in
>  create mode 100644 package/libapr/libapr.mk
> 
> diff --git a/package/Config.in b/package/Config.in
> index 4c6d4d8..ceb5f6d 100644
> --- a/package/Config.in
> +++ b/package/Config.in
> @@ -376,6 +376,7 @@ source "package/fftw/Config.in"
>  source "package/libargtable2/Config.in"
>  source "package/argp-standalone/Config.in"
>  source "package/boost/Config.in"
> +source "package/libapr/Config.in"
>  source "package/libatomic_ops/Config.in"
>  source "package/libcap/Config.in"
>  source "package/libcap-ng/Config.in"
> diff --git a/package/libapr/Config.in b/package/libapr/Config.in
> new file mode 100644
> index 0000000..51dea91
> --- /dev/null
> +++ b/package/libapr/Config.in
> @@ -0,0 +1,7 @@
> +config BR2_PACKAGE_LIBAPR
> +
> +	bool "libapr"
> +	help
> +	  The mission of the Apache Portable Runtime (APR) project is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementations

Could you wrap this line to 80 characters ?

> +	  http://apr.apache.org/
> diff --git a/package/libapr/libapr.mk b/package/libapr/libapr.mk
> new file mode 100644
> index 0000000..57da8ef
> --- /dev/null
> +++ b/package/libapr/libapr.mk
> @@ -0,0 +1,12 @@
> +#############################################################
> +#
> +# libapr
> +#
> +#############################################################
> +LIBAPR_VERSION = 1.4.6
> +LIBAPR_SOURCE = apr-$(LIBAPR_VERSION).tar.gz
> +LIBAPR_SITE = http://mirror.switch.ch/mirror/apache/dist/apr
> +LIBAPR_INSTALL_STAGING = YES
> +LIBAPR_CONF_OPT = ac_cv_file__dev_zero=yes ac_cv_func_setpgrp_void=yes apr_cv_process_shared_works=yes apr_cv_mutex_robust_shared=no apr_cv_tcp_nodelay_with_cork=yes ac_cv_sizeof_struct_iovec=8 apr_cv_mutex_recursive=yes --enable-shared

All the ac_cv_* stuff should go into LIBAPR_CONF_ENV variable.
You should wrap the line to 80 characters also.
--enabled-shared is automatically set by buildroot if it needs to when
the package is built, so you don't need to set it here.

Otherwise, it looks good to me.

Thanks,
Maxime
Thomas Petazzoni - April 17, 2012, 11:39 a.m.
Hello Rico,

Thanks for this contribution!

Le Tue, 17 Apr 2012 12:59:30 +0200,
Rico Bachmann <bachmann@tofwerk.com> a écrit :

> +++ b/package/libapr/Config.in
> @@ -0,0 +1,7 @@
> +config BR2_PACKAGE_LIBAPR
> +

Remove this blank line.

> +	bool "libapr"
> +	help
> +	  The mission of the Apache Portable Runtime (APR) project is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementations

This text should be wrapped at ~80 columns.

> new file mode 100644
> index 0000000..57da8ef
> --- /dev/null
> +++ b/package/libapr/libapr.mk
> @@ -0,0 +1,12 @@
> +#############################################################
> +#
> +# libapr
> +#
> +#############################################################
> +LIBAPR_VERSION = 1.4.6
> +LIBAPR_SOURCE = apr-$(LIBAPR_VERSION).tar.gz

Yegor's suggestion didn't work because by default we download
<package-name>-<package-version>.tar.gz. However here you decided to
name the Buildroot package "libapr", while the upstream package is
"apr". Maybe we should use the "apr" name like upstream?

> +LIBAPR_SITE = http://mirror.switch.ch/mirror/apache/dist/apr
> +LIBAPR_INSTALL_STAGING = YES
> +LIBAPR_CONF_OPT = ac_cv_file__dev_zero=yes ac_cv_func_setpgrp_void=yes apr_cv_process_shared_works=yes apr_cv_mutex_robust_shared=no apr_cv_tcp_nodelay_with_cork=yes ac_cv_sizeof_struct_iovec=8 apr_cv_mutex_recursive=yes --enable-shared

Please wrap this this way:

LIBAPR_CONF_OPT = \
	ac_cv_file__dev_zero=yes \
	ac_cv_func_setgrp_void=yes \
	...

And remove --enable-shared since it is already passed by default, and
tuned when BR2_PREFER_STATIC is used.

Regards,

Thomas
Peter Korsgaard - April 17, 2012, 12:01 p.m.
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 >> +	bool "libapr"
 >> +	help
 >> +	  The mission of the Apache Portable Runtime (APR) project is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementations

 Thomas> This text should be wrapped at ~80 columns.

And the upstream URL should be added below.

 >> new file mode 100644
 >> index 0000000..57da8ef
 >> --- /dev/null
 >> +++ b/package/libapr/libapr.mk
 >> @@ -0,0 +1,12 @@
 >> +#############################################################
 >> +#
 >> +# libapr
 >> +#
 >> +#############################################################
 >> +LIBAPR_VERSION = 1.4.6
 >> +LIBAPR_SOURCE = apr-$(LIBAPR_VERSION).tar.gz

 Thomas> Yegor's suggestion didn't work because by default we download
 Thomas> <package-name>-<package-version>.tar.gz. However here you decided to
 Thomas> name the Buildroot package "libapr", while the upstream package is
 Thomas> "apr". Maybe we should use the "apr" name like upstream?

Agreed.

 >> +LIBAPR_SITE = http://mirror.switch.ch/mirror/apache/dist/apr

I know the apr website directs you to a local mirror, but perhaps it
would make more sense to use archive.apache.org/dist/apr instead of this
.ch mirror?
Rico Bachmann - April 17, 2012, 12:18 p.m.
Am 17.04.2012, 13:36 Uhr, schrieb Maxime Ripard  
<maxime.ripard@free-electrons.com>:

> Hi,
>
> Thanks for your patch!
>
> Le 17/04/2012 12:59, Rico Bachmann a écrit :
>> Signed-off-by: Rico Bachmann  
>> <bachmann@tofwerk.com>
>> ---
>>  package/Config.in        |    1 +
>>  package/libapr/Config.in |    7 +++++++
>>  package/libapr/libapr.mk |   12 ++++++++++++
>>  3 files changed, 20 insertions(+), 0 deletions(-)
>>  create mode 100644 package/libapr/Config.in
>>  create mode 100644 package/libapr/libapr.mk
>>
>> diff --git a/package/Config.in b/package/Config.in
>> index 4c6d4d8..ceb5f6d 100644
>> --- a/package/Config.in
>> +++ b/package/Config.in
>> @@ -376,6 +376,7 @@ source "package/fftw/Config.in"
>>  source "package/libargtable2/Config.in"
>>  source "package/argp-standalone/Config.in"
>>  source "package/boost/Config.in"
>> +source "package/libapr/Config.in"
>>  source "package/libatomic_ops/Config.in"
>>  source "package/libcap/Config.in"
>>  source "package/libcap-ng/Config.in"
>> diff --git a/package/libapr/Config.in b/package/libapr/Config.in
>> new file mode 100644
>> index 0000000..51dea91
>> --- /dev/null
>> +++ b/package/libapr/Config.in
>> @@ -0,0 +1,7 @@
>> +config BR2_PACKAGE_LIBAPR
>> +
>> +	bool "libapr"
>> +	help
>> +	  The mission of the Apache Portable Runtime (APR) project is to  
>> create and maintain software libraries that provide a predictable and  
>> consistent interface to underlying platform-specific implementations
>
> Could you wrap this line to 80 characters ?

I will wrap this line in my next patch

>
>> +	  http://apr.apache.org/
>> diff --git a/package/libapr/libapr.mk b/package/libapr/libapr.mk
>> new file mode 100644
>> index 0000000..57da8ef
>> --- /dev/null
>> +++ b/package/libapr/libapr.mk
>> @@ -0,0 +1,12 @@
>> +#############################################################
>> +#
>> +# libapr
>> +#
>> +#############################################################
>> +LIBAPR_VERSION = 1.4.6
>> +LIBAPR_SOURCE = apr-$(LIBAPR_VERSION).tar.gz
>> +LIBAPR_SITE = http://mirror.switch.ch/mirror/apache/dist/apr
>> +LIBAPR_INSTALL_STAGING = YES
>> +LIBAPR_CONF_OPT = ac_cv_file__dev_zero=yes ac_cv_func_setpgrp_void=yes  
>> apr_cv_process_shared_works=yes apr_cv_mutex_robust_shared=no  
>> apr_cv_tcp_nodelay_with_cork=yes ac_cv_sizeof_struct_iovec=8  
>> apr_cv_mutex_recursive=yes --enable-shared
>
> All the ac_cv_* stuff should go into LIBAPR_CONF_ENV variable.
> You should wrap the line to 80 characters also.
> --enabled-shared is automatically set by buildroot if it needs to when
> the package is built, so you don't need to set it here.

Ok i will add the apr_cv_* stuff to LIBAPR_CONF_ENV instead of  
LIBAPR_CONF_OPT
and delete the --enable-shared argument

>
> Otherwise, it looks good to me.
>
> Thanks,
> Maxime
>
Rico Bachmann - April 17, 2012, 12:18 p.m.
Am 17.04.2012, 13:39 Uhr, schrieb Thomas Petazzoni  
<thomas.petazzoni@free-electrons.com>:

> Hello Rico,
>
> Thanks for this contribution!
>
> Le Tue, 17 Apr 2012 12:59:30 +0200,
> Rico Bachmann <bachmann@tofwerk.com> a écrit :
>
>> +++ b/package/libapr/Config.in
>> @@ -0,0 +1,7 @@
>> +config BR2_PACKAGE_LIBAPR
>> +
>
> Remove this blank line.

the line will be gone with my next patch :)

>
>> +	bool "libapr"
>> +	help
>> +	  The mission of the Apache Portable Runtime (APR) project is to  
>> create and maintain software libraries that provide a predictable and  
>> consistent interface to underlying platform-specific implementations
>
> This text should be wrapped at ~80 columns.
>
>> new file mode 100644
>> index 0000000..57da8ef
>> --- /dev/null
>> +++ b/package/libapr/libapr.mk
>> @@ -0,0 +1,12 @@
>> +#############################################################
>> +#
>> +# libapr
>> +#
>> +#############################################################
>> +LIBAPR_VERSION = 1.4.6
>> +LIBAPR_SOURCE = apr-$(LIBAPR_VERSION).tar.gz
>
> Yegor's suggestion didn't work because by default we download
> <package-name>-<package-version>.tar.gz. However here you decided to
> name the Buildroot package "libapr", while the upstream package is
> "apr". Maybe we should use the "apr" name like upstream?

if it is the preferred way I can change the name of the package to arp
and delete the LIBAPR_SOURCE line, that's no problem

>
>> +LIBAPR_SITE = http://mirror.switch.ch/mirror/apache/dist/apr
>> +LIBAPR_INSTALL_STAGING = YES
>> +LIBAPR_CONF_OPT = ac_cv_file__dev_zero=yes ac_cv_func_setpgrp_void=yes  
>> apr_cv_process_shared_works=yes apr_cv_mutex_robust_shared=no  
>> apr_cv_tcp_nodelay_with_cork=yes ac_cv_sizeof_struct_iovec=8  
>> apr_cv_mutex_recursive=yes --enable-shared
>
> Please wrap this this way:
>
> LIBAPR_CONF_OPT = \
> 	ac_cv_file__dev_zero=yes \
> 	ac_cv_func_setgrp_void=yes \
> 	...
>
> And remove --enable-shared since it is already passed by default, and
> tuned when BR2_PREFER_STATIC is used.
>
> Regards,
>
> Thomas
Rico Bachmann - April 17, 2012, 12:22 p.m.
Am 17.04.2012, 14:01 Uhr, schrieb Peter Korsgaard  
<jacmet@uclibc.org>:

>>>>>> "Thomas" == Thomas Petazzoni  
>>>>>> <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>  
>>>>>> writes:
>
> Hi,
>
>  >> +	bool "libapr"
>  >> +	help
>  >> +	  The mission of the Apache Portable Runtime (APR) project is to  
> create and maintain software libraries that provide a predictable and  
> consistent interface to underlying platform-specific implementations
>
>  Thomas> This text should be wrapped at ~80 columns.
>
> And the upstream URL should be added below.
>
>  >> new file mode 100644
>  >> index 0000000..57da8ef
>  >> --- /dev/null
>  >> +++ b/package/libapr/libapr.mk
>  >> @@ -0,0 +1,12 @@
>  >> +#############################################################
>  >> +#
>  >> +# libapr
>  >> +#
>  >> +#############################################################
>  >> +LIBAPR_VERSION = 1.4.6
>  >> +LIBAPR_SOURCE = apr-$(LIBAPR_VERSION).tar.gz
>
>  Thomas> Yegor's suggestion didn't work because by default we download
>  Thomas> <package-name>-<package-version>.tar.gz. However here you  
> decided to
>  Thomas> name the Buildroot package "libapr", while the upstream package  
> is
>  Thomas> "apr". Maybe we should use the "apr" name like upstream?
>
> Agreed.

I'll do that change with my next patch

>
>  >> +LIBAPR_SITE = http://mirror.switch.ch/mirror/apache/dist/apr
>
> I know the apr website directs you to a local mirror, but perhaps it
> would make more sense to use archive.apache.org/dist/apr instead of this
> .ch mirror?
>

ah i didn't saw that i used a local mirror, i'll change that to.

Patch

diff --git a/package/Config.in b/package/Config.in
index 4c6d4d8..ceb5f6d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -376,6 +376,7 @@  source "package/fftw/Config.in"
 source "package/libargtable2/Config.in"
 source "package/argp-standalone/Config.in"
 source "package/boost/Config.in"
+source "package/libapr/Config.in"
 source "package/libatomic_ops/Config.in"
 source "package/libcap/Config.in"
 source "package/libcap-ng/Config.in"
diff --git a/package/libapr/Config.in b/package/libapr/Config.in
new file mode 100644
index 0000000..51dea91
--- /dev/null
+++ b/package/libapr/Config.in
@@ -0,0 +1,7 @@ 
+config BR2_PACKAGE_LIBAPR
+
+	bool "libapr"
+	help
+	  The mission of the Apache Portable Runtime (APR) project is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementations
+
+	  http://apr.apache.org/
diff --git a/package/libapr/libapr.mk b/package/libapr/libapr.mk
new file mode 100644
index 0000000..57da8ef
--- /dev/null
+++ b/package/libapr/libapr.mk
@@ -0,0 +1,12 @@ 
+#############################################################
+#
+# libapr
+#
+#############################################################
+LIBAPR_VERSION = 1.4.6
+LIBAPR_SOURCE = apr-$(LIBAPR_VERSION).tar.gz
+LIBAPR_SITE = http://mirror.switch.ch/mirror/apache/dist/apr
+LIBAPR_INSTALL_STAGING = YES
+LIBAPR_CONF_OPT = ac_cv_file__dev_zero=yes ac_cv_func_setpgrp_void=yes apr_cv_process_shared_works=yes apr_cv_mutex_robust_shared=no apr_cv_tcp_nodelay_with_cork=yes ac_cv_sizeof_struct_iovec=8 apr_cv_mutex_recursive=yes --enable-shared
+
+$(eval $(call AUTOTARGETS))