Skip to contentSkip to conversation

Add missing dependency to netatalk

PATCH Superseded Maxime Hadjinlian 4 participants 10 messages Nov 4, 2012 – Nov 8, 2012

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Maxime Hadjinlian

author
#0 lore raw

PATCH 1/2 Add missing dependency to netatalk

Netatalk need pkg-config, otherwise the configure script is complaining.

---
 package/netatalk/netatalk.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/netatalk/netatalk.mk +1 -1
index c01e360..4aa179e 100644
@@ -7,7 +7,7 @@ NETATALK_VERSION = 3.0
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
-NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
+NETATALK_DEPENDENCIES = host-pkg-config openssl berkeleydb libgcrypt libgpg-error
 NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
 NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--with-bdb=$(STAGING_DIR)/usr \

--
1.7.10.4

author
#1 lore raw

PATCH 2/2 Make BerkeleyDB optional for Netatalk

As the documentation of netatalk states :
"dbd is the default backend since version 2.1"
So cdb (which is the CNID provided by BerkeleyDB) should not be the default.

Also, this patches fixes a trouble when compiling with berkeleydb in 64bits where netatalk would look the berkeleylib in [...]/lib64 instead of [...]/lib

---
 package/netatalk/Config.in   |    1 -
 package/netatalk/netatalk.mk |   16 ++++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)
package/netatalk/Config.in +0 -1
index 26f14c3..e602acd 100644
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_NETATALK
 	bool "netatalk"
-	select BR2_PACKAGE_BERKELEYDB
 	select BR2_PACKAGE_OPENSSL
 	select BR2_PACKAGE_LIBGCRYPT
 	select BR2_PACKAGE_LIBGPG_ERROR
package/netatalk/netatalk.mk +12 -4
index 4aa179e..70c8a13 100644
@@ -7,11 +7,10 @@ NETATALK_VERSION = 3.0
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
-NETATALK_DEPENDENCIES = host-pkg-config openssl berkeleydb libgcrypt libgpg-error
+NETATALK_DEPENDENCIES = host-pkg-config openssl libgcrypt libgpg-error
 NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
-NETATALK_CONF_OPT += --with-cnid-cdb-backend \
-	--with-bdb=$(STAGING_DIR)/usr \
-	--disable-zeroconf \
+
+NETATALK_CONF_OPT += --disable-zeroconf \
 	--with-ssl-dir=$(STAGING_DIR)/usr \
 	--with-libgcrypt-dir=$(STAGING_DIR)/usr \
 	--with-shadow \

@@ -19,6 +18,15 @@ NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--without-kerberos \
 	--without-pam
 
+ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
+	NETATALK_DEPENDENCIES += berkeleydb
+	NETATALK_CONF_ENV += BDB_LIB=$(STAGING_LIB)/usr/lib
+	NETATALK_CONF_OPT += --with-cnid-cdb-backend \
+		--with-bdb=$(STAGING_DIR)/usr
+else
+	NETATALK_CONF_OPT += --without-cnid-cdb-backend
+endif
+
 ifeq ($(BR2_PACKAGE_CUPS),y)
 	NETATALK_DEPENDENCIES += cups
 	NETATALK_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config

--
1.7.10.4

#2 lore raw

PATCH 1/2 Add missing dependency to netatalk

In reply to Maxime Hadjinlian

Dear Maxime Hadjinlian,

package/netatalk/netatalk.mk NETATALK_VERSION = 3.0 · line 10

Quoted 2 lines · Maxime Hadjinlian
package/netatalk/netatalk.mk +1 -1
-NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
+NETATALK_DEPENDENCIES = host-pkg-config openssl berkeleydb libgcrypt libgpg-error

host-pkg-config should now be host-pkgconf.

Peter, Arnout, shouldn't we be adding a dummy 'host-pkg-config' target in order to avoid breaking all external packages that are using host-pkg-config? Didn't we talk about not breaking APIs? :-)

Best regards,

Thomas

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH 1/2 Add missing dependency to netatalk

Quoted 4 lines · Thomas Petazzoni

Dear Maxime Hadjinlian,

On Sun, 4 Nov 2012 20:25:22 +0100, Maxime Hadjinlian wrote:

Quoted 8 lines

package/netatalk/netatalk.mk NETATALK_VERSION = 3.0 · line 10

Quoted 2 lines
package/netatalk/netatalk.mk +1 -1
-NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
+NETATALK_DEPENDENCIES = host-pkg-config openssl berkeleydb libgcrypt libgpg-error

host-pkg-config should now be host-pkgconf.

Peter, Arnout, shouldn't we be adding a dummy 'host-pkg-config' target in order to avoid breaking all external packages that are using host-pkg-config? Didn't we talk about not breaking APIs? :-)

Seems like a good idea.

But I would make it issue an error, so people update their .mk files.

Maybe we can create a top-level Makefile.legacy and Config.in.legacy that
collects all the API-compatibility-warnings-and-errors. That makes it easier to remove them later.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
#4 lore raw

PATCH 1/2 Add missing dependency to netatalk

Quoted 7 lines
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Arnout" == Arnout Vandecappelle <[email protected]> writes:

host-pkg-config should now be host-pkgconf.

Peter, Arnout, shouldn't we be adding a dummy 'host-pkg-config' target in order to avoid breaking all external packages that are using host-pkg-config? Didn't we talk about not breaking APIs? :-)

Arnout> Seems like a good idea.

Arnout> But I would make it issue an error, so people update their .mk Arnout> files.

Arnout> Maybe we can create a top-level Makefile.legacy and Arnout> Config.in.legacy that collects all the
Arnout> API-compatibility-warnings-and-errors. That makes it easier to Arnout> remove them later.

Sounds like a good idea. Care to cook up a patch?

Signature · 1 line
Bye, Peter Korsgaard
#5 lore raw

PATCH 1/2 Add missing dependency to netatalk

In reply to Maxime Hadjinlian
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Maxime" == Maxime Hadjinlian <[email protected]> writes:

Maxime> Netatalk need pkg-config, otherwise the configure script is complaining.

Next to the comment of Thomas, also remember to sign off on your patches (-s argument to git commit).

Signature · 1 line
Bye, Peter Korsgaard
author
#6 lore raw

PATCH 1/2 Add missing dependency to netatalk

Quoted 9 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Maxime" == Maxime Hadjinlian <[email protected]> writes:

Maxime> Netatalk need pkg-config, otherwise the configure script is
complaining.

Next to the comment of Thomas, also remember to sign off on your patches (-s argument to git commit).

I'll resend this patch (and the second one as I also forgot to signed it)

after the ELC, my hotel connection doesn't seem to appreciate smtp and tls :/

Quoted 3 lines

--
Bye, Peter Korsgaard

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20121106/dd31a0f8/attachment.html>

author
#7 lore raw

PATCH 1/2 netatalk: Add missing dependency to netatalk

Netatalk need pkg-config, otherwise the configure script is complaining.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/netatalk/netatalk.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/netatalk/netatalk.mk +1 -1
index c01e360..4aa179e 100644
@@ -7,7 +7,7 @@ NETATALK_VERSION = 3.0
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
-NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
+NETATALK_DEPENDENCIES = host-pkg-config openssl berkeleydb libgcrypt libgpg-error
 NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
 NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--with-bdb=$(STAGING_DIR)/usr \

--
1.7.10.4

author
#8 lore raw

PATCH 1/2 netatalk: Add missing dependency to netatalk

In reply to Maxime Hadjinlian

Netatalk need pkg-config, otherwise the configure script is complaining.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/netatalk/netatalk.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/netatalk/netatalk.mk +1 -1
index c01e360..4aa179e 100644
@@ -7,7 +7,7 @@ NETATALK_VERSION = 3.0
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
-NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
+NETATALK_DEPENDENCIES = host-pkg-config openssl berkeleydb libgcrypt libgpg-error
 NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
 NETATALK_CONF_OPT += --with-cnid-cdb-backend \
 	--with-bdb=$(STAGING_DIR)/usr \

--
1.7.10.4

author
#9 lore raw

PATCH 1/2 netatalk: Add missing dependency to netatalk

Sorry, I messed up with the message id and did not end up in the right thread (should have tested with my own mail), do you want me to resend them so they correctly appear in the right thread (also I should have marked them as v2 :/)

Quoted 23 lines · Maxime Hadjinlian

Netatalk need pkg-config, otherwise the configure script is complaining.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 package/netatalk/netatalk.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/netatalk/netatalk.mk +1 -2
index c01e360..4aa179e 100644
@@ -7,7 +7,7 @@ NETATALK_VERSION = 3.0
 NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION)
 NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2
 
-NETATALK_DEPENDENCIES = openssl berkeleydb libgcrypt libgpg-error
+NETATALK_DEPENDENCIES = host-pkg-config openssl berkeleydb libgcrypt libgpg-error
 NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99"
 NETATALK_CONF_OPT += --with-cnid-cdb-backend \
        --with-bdb=$(STAGING_DIR)/usr \
--

1.7.10.4