Skip to contentSkip to conversation

sconeserver: new package

PATCH Superseded spdawson at gmail.com 2 participants 3 messages Sep 19, 2012 – Sep 21, 2012

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 sconeserver: new package

From: Simon Dawson <[email protected]>

---
v5: Rebase and resend.
v4: Resend.
v3: Fix build failure for mysql module; ui module depends on X.org.
v2: Extensive rework in response to feedback on mailing list.

 package/Config.in                  |    1 +
 package/sconeserver/Config.in      |   88 +++++++++++++++++++++++++++
 package/sconeserver/sconeserver.mk |  115 ++++++++++++++++++++++++++++++++++++
 3 files changed, 204 insertions(+)
 create mode 100644 package/sconeserver/Config.in
 create mode 100644 package/sconeserver/sconeserver.mk
package/Config.in +1 -0
index 58dd5e8..e0841da 100644
@@ -606,6 +606,7 @@ source "package/rsh-redone/Config.in"
 source "package/rsync/Config.in"
 source "package/rtorrent/Config.in"
 source "package/samba/Config.in"
+source "package/sconeserver/Config.in"
 source "package/ser2net/Config.in"
 source "package/socat/Config.in"
 source "package/socketcand/Config.in"
package/sconeserver/Config.in new file +88 -0

88 lines not on this page · raw message

package/sconeserver/sconeserver.mk new file +115 -0

115 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#1 lore raw

PATCH v5 1/1 sconeserver: new package

package/sconeserver/sconeserver.mk line 26

Quoted 8 lines · spdawson at gmail.com
package/sconeserver/sconeserver.mk new file +8 -0
+# Sconeserver configure script fails to find the libxml2 headers.
+ifeq ($(BR2_PACKAGE_LIBXML2),y)
+	SCONESERVER_CONF_OPT += CPPFLAGS="-I$(STAGING_DIR)/usr/include/libxml2"
+endif
+
+ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y)
+	SCONESERVER_CONF_OPT += LDFLAGS="-L$(STAGING_DIR)/usr/lib/mysql"
+endif

I'd suggest using the following pattern:

SCONESERVER_CONF_OPT += CXXFLAGS="$(TARGET_CXXFLAGS) $(SCONESERVER_CXXFLAGS)" SCONESERVER_CONF_OPT += LDFLAGS="$(TARGET_LDFLAGS) $(SCONESERVER_LDFLAGS)"

ifeq ($(BR2_PACKAGE_LIBXML2),y) SCONESERVER_CXXFLAGS += -I$(STAGING_DIR)/usr/include/libxml2 endif

(Actually, this pattern should move to TARGET_CFLAGS itself... Yet another item on my ideas list :-)

The mysql flags should move to the rest of the mysql stuff, so you have the
condition only once.

I tried building the mysql module and it also fails to find mysql.h. Turns
out that the configure script hard-codes -I/usr/include/mysql instead of using the sysrooted path. I'm not sure how to fix it elegantly. Adding a -I option to the CXXFLAGS works, but you still get a -I/usr/include/mysql which may cause problems...

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
#2 lore raw

PATCH v5 1/1 sconeserver: new package

Quoted 6 lines · Arnout Vandecappelle

I tried building the mysql module and it also fails to find mysql.h. Turns
out that the configure script hard-codes -I/usr/include/mysql instead of using
the sysrooted path. I'm not sure how to fix it elegantly. Adding a -I option to the CXXFLAGS works, but you still get a -I/usr/include/mysql which may cause problems...

Thanks for your help with this Arnout; much appreciated. I'll incorporate your ideas and submit an updated patch.

Simon.