Patchwork Add package subversion

login
register
mail settings
Submitter Rico Bachmann
Date April 29, 2013, 10:35 a.m.
Message ID <1367231746-30319-1-git-send-email-bachmann@tofwerk.com>
Download mbox | patch
Permalink /patch/240358/
State Superseded
Headers show

Comments

Rico Bachmann - April 29, 2013, 10:35 a.m.
Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
---
 package/Config.in                |    1 +
 package/subversion/Config.in     |    9 +++++++++
 package/subversion/subversion.mk |   22 ++++++++++++++++++++++
 3 files changed, 32 insertions(+), 0 deletions(-)
 create mode 100644 package/subversion/Config.in
 create mode 100644 package/subversion/subversion.mk
Baruch Siach - April 29, 2013, 11:03 a.m.
Hi Rico,

On Mon, Apr 29, 2013 at 12:35:46PM +0200, Rico Bachmann wrote:
> Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
> ---

[snip]

> @@ -0,0 +1,9 @@
> +config BR2_PACKAGE_SUBVERSION
> +	bool "subversion"
> +	select BR2_PACKAGE_APR_UTIL

select BR2_PACKAGE_EXPAT

> +	# apr really needs shared library support
> +	depends on !BR2_PREFER_STATIC_LIB
> +	help
> +	  Subversion is an open source version control system
> +	  
> +	  http://subversion.apache.org/

[snip]

> +SUBVERSION_VERSION = 1.7.9
> +SUBVERSION_SITE = http://archive.apache.org/dist/subversion
> +SUBVERSION_DEPENDENCIES = apr apr-util expat
> +SUBVERSION_CONF_OPT = \
> +	--with-expat=$(STAGING_DIR)/usr:$(STAGING_DIR)/usr:expat \

The ":$(STAGING_DIR)/usr:expat" part looks wrong. Are you sure this is needed?

> +	--with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \
> +	--with-apr-util=$(BUILD_DIR)/apr-util-$(APR_UTIL_VERSION)

[snip]

baruch
Rico Bachmann - April 29, 2013, 11:23 a.m.
Hi Baruch

> -----Urspr√ľngliche Nachricht-----
> Von: Baruch Siach [mailto:baruch@tkos.co.il]
> Gesendet: Montag, 29. April 2013 13:03
> An: Rico Bachmann
> Cc: buildroot@uclibc.org
> Betreff: Re: [Buildroot] [PATCH] Add package subversion
> 
> Hi Rico,
> 
> On Mon, Apr 29, 2013 at 12:35:46PM +0200, Rico Bachmann wrote:
> > Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
> > ---
> 
> [snip]
> 
> > @@ -0,0 +1,9 @@
> > +config BR2_PACKAGE_SUBVERSION
> > +	bool "subversion"
> > +	select BR2_PACKAGE_APR_UTIL
> 
> select BR2_PACKAGE_EXPAT

I add this line in a new patch version

> 
> > +	# apr really needs shared library support
> > +	depends on !BR2_PREFER_STATIC_LIB
> > +	help
> > +	  Subversion is an open source version control system
> > +
> > +	  http://subversion.apache.org/
> 
> [snip]
> 
> > +SUBVERSION_VERSION = 1.7.9
> > +SUBVERSION_SITE = http://archive.apache.org/dist/subversion
> > +SUBVERSION_DEPENDENCIES = apr apr-util expat SUBVERSION_CONF_OPT = \
> > +	--with-expat=$(STAGING_DIR)/usr:$(STAGING_DIR)/usr:expat \
> 
> The ":$(STAGING_DIR)/usr:expat" part looks wrong. Are you sure this is
> needed?

I check if the ":$(STAGING_DIR)/usr:expat" part is really needed, before I
send the new patch version.

> 
> > +	--with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \
> > +	--with-apr-util=$(BUILD_DIR)/apr-util-$(APR_UTIL_VERSION)
> 
> [snip]
> 
> baruch
> 
> --
>      http://baruch.siach.name/blog/                  ~. .~   Tk Open
> Systems
> =}------------------------------------------------ooO--U--Ooo----------
> --{=
>    - baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

I'll send the new patch version during this day.

Greez
Rico
Rico Bachmann - April 30, 2013, 1:53 p.m.
> -----Urspr√ľngliche Nachricht-----
> Von: Baruch Siach [mailto:baruch@tkos.co.il]
> Gesendet: Montag, 29. April 2013 13:03
> An: Rico Bachmann
> Cc: buildroot@uclibc.org
> Betreff: Re: [Buildroot] [PATCH] Add package subversion
> 
> Hi Rico,
> 
> On Mon, Apr 29, 2013 at 12:35:46PM +0200, Rico Bachmann wrote:
> > Signed-off-by: Rico Bachmann <bachmann@tofwerk.com>
> > ---
> 
> [snip]
> 
> > @@ -0,0 +1,9 @@
> > +config BR2_PACKAGE_SUBVERSION
> > +	bool "subversion"
> > +	select BR2_PACKAGE_APR_UTIL
> 
> select BR2_PACKAGE_EXPAT

I found some other issues I have to fix (for neon and expat).
I will add a nice solution to choos which feature are enabled in subversion

> 
> > +	# apr really needs shared library support
> > +	depends on !BR2_PREFER_STATIC_LIB
> > +	help
> > +	  Subversion is an open source version control system
> > +
> > +	  http://subversion.apache.org/
> 
> [snip]
> 
> > +SUBVERSION_VERSION = 1.7.9
> > +SUBVERSION_SITE = http://archive.apache.org/dist/subversion
> > +SUBVERSION_DEPENDENCIES = apr apr-util expat
> > +SUBVERSION_CONF_OPT = \
> > +	--with-expat=$(STAGING_DIR)/usr:$(STAGING_DIR)/usr:expat \
> 
> The ":$(STAGING_DIR)/usr:expat" part looks wrong. Are you sure this is
> needed?

I couldn't get it running without this part. I will let this line as it is.

> 
> > +	--with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \
> > +	--with-apr-util=$(BUILD_DIR)/apr-util-$(APR_UTIL_VERSION)
> 
> [snip]
> 
> baruch
> 
> --
>      http://baruch.siach.name/blog/                  ~. .~   Tk Open
> Systems
> =}------------------------------------------------ooO--U--Ooo----------
> --{=
>    - baruch@tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

I should send the new patch during this or next week, can't say excatly when
I find the time.

Patch

diff --git a/package/Config.in b/package/Config.in
index bcd3d8d..13196e4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -90,6 +90,7 @@  if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/sed/Config.in"
 endif
 source "package/sstrip/Config.in"
+source "package/subversion/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tar/Config.in"
 endif
diff --git a/package/subversion/Config.in b/package/subversion/Config.in
new file mode 100644
index 0000000..4e5c4ae
--- /dev/null
+++ b/package/subversion/Config.in
@@ -0,0 +1,9 @@ 
+config BR2_PACKAGE_SUBVERSION
+	bool "subversion"
+	select BR2_PACKAGE_APR_UTIL
+	# apr really needs shared library support
+	depends on !BR2_PREFER_STATIC_LIB
+	help
+	  Subversion is an open source version control system
+	  
+	  http://subversion.apache.org/
diff --git a/package/subversion/subversion.mk b/package/subversion/subversion.mk
new file mode 100644
index 0000000..7a91842
--- /dev/null
+++ b/package/subversion/subversion.mk
@@ -0,0 +1,22 @@ 
+#############################################################
+#
+# subversion
+#
+#############################################################
+SUBVERSION_VERSION = 1.7.9
+SUBVERSION_SITE = http://archive.apache.org/dist/subversion
+SUBVERSION_DEPENDENCIES = apr apr-util expat
+SUBVERSION_CONF_OPT = \
+	--with-expat=$(STAGING_DIR)/usr:$(STAGING_DIR)/usr:expat \
+	--with-apr=$(BUILD_DIR)/apr-$(APR_VERSION) \
+	--with-apr-util=$(BUILD_DIR)/apr-util-$(APR_UTIL_VERSION)
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+SUBVERSION_CONF_OPT += \
+	--with-zlib=$(STAGING_DIR)/usr
+endif
+ifeq ($(BR2_PACKAGE_NEON),y)	
+SUBVERSION_CONF_OPT += \
+	--with-neon=$(STAGING_DIR)/usr
+endif
+
+$(eval $(autotools-package))