All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] newt: fix weird indentation
@ 2014-03-28 23:29 Gustavo Zacarias
  2014-03-28 23:29 ` [Buildroot] [PATCH 2/2] slang: multiple fixes Gustavo Zacarias
  2014-03-29  8:06 ` [Buildroot] [PATCH 1/2] newt: fix weird indentation Thomas Petazzoni
  0 siblings, 2 replies; 3+ messages in thread
From: Gustavo Zacarias @ 2014-03-28 23:29 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/newt/newt.mk | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/package/newt/newt.mk b/package/newt/newt.mk
index b567156..85e75f4 100644
--- a/package/newt/newt.mk
+++ b/package/newt/newt.mk
@@ -4,16 +4,14 @@
 #
 ################################################################################
 
-NEWT_VERSION         = 0.52.17
-NEWT_SITE            = https://fedorahosted.org/releases/n/e/newt/
-NEWT_LICENSE         = GPLv2
-NEWT_LICENSE_FILES   = COPYING
+NEWT_VERSION = 0.52.17
+NEWT_SITE = https://fedorahosted.org/releases/n/e/newt/
 NEWT_INSTALL_STAGING = YES
-
-NEWT_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) slang popt
-
+NEWT_DEPENDENCIES = popt slang \
+	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)
 NEWT_CONF_OPT = --without-python --without-tcl
-
 NEWT_MAKE = $(MAKE1)
+NEWT_LICENSE = GPLv2
+NEWT_LICENSE_FILES = COPYING
 
 $(eval $(autotools-package))
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 2/2] slang: multiple fixes
  2014-03-28 23:29 [Buildroot] [PATCH 1/2] newt: fix weird indentation Gustavo Zacarias
@ 2014-03-28 23:29 ` Gustavo Zacarias
  2014-03-29  8:06 ` [Buildroot] [PATCH 1/2] newt: fix weird indentation Thomas Petazzoni
  1 sibling, 0 replies; 3+ messages in thread
From: Gustavo Zacarias @ 2014-03-28 23:29 UTC (permalink / raw)
  To: buildroot

Add a gentoo patch to fix the wicked slsh link line that ended in the
bizarre prefix/exec_prefix/DESTDIR trickery.
Also fixes:
http://autobuild.buildroot.net/results/c3f/c3fb5337a4bdf87baead64106427c4929241c58d/

Also be explicit with enabling/disabling libpng, pcre, readline and zlib
support since they get picked up from the host if header files are
around because of the problem known as "absolute paths" when trying to
autodetect.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/slang/slang-01-slsh-libs.patch | 17 +++++++++++++
 package/slang/slang.mk                 | 44 ++++++++++++++++++++--------------
 2 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 package/slang/slang-01-slsh-libs.patch

diff --git a/package/slang/slang-01-slsh-libs.patch b/package/slang/slang-01-slsh-libs.patch
new file mode 100644
index 0000000..e8b6e6d
--- /dev/null
+++ b/package/slang/slang-01-slsh-libs.patch
@@ -0,0 +1,17 @@
+Link against sources instead of installation paths that aren't DESTDIRed.
+Patch taken from gentoo portage, upstream status unknown, author
+probably Diego Petten?.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/slsh/Makefile.in
++++ b/slsh/Makefile.in
+@@ -80,7 +80,7 @@
+ $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+ 	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o
+-	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(INST_LIBS)
++	$(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS)
+ $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile
+ 	cd $(OBJDIR) && $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) $(SRCDIR)/slsh.c
+ $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile
diff --git a/package/slang/slang.mk b/package/slang/slang.mk
index d943de3..ad1155d 100644
--- a/package/slang/slang.mk
+++ b/package/slang/slang.mk
@@ -13,27 +13,35 @@ SLANG_LICENSE_FILES = COPYING
 SLANG_INSTALL_STAGING = YES
 SLANG_MAKE = $(MAKE1)
 
-ifeq ($(BR2_PACKAGE_NCURSES),y)
-	SLANG_DEPENDENCIES = ncurses
+# Absolute path hell, sigh...
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+	SLANG_CONF_OPT += --with-png=$(STAGING_DIR)/usr
+	SLANG_DEPENDENCIES += libpng
+else
+	SLANG_CONF_OPT += --with-png=no
+endif
+ifeq ($(BR2_PACKAGE_PCRE),y)
+	SLANG_CONF_OPT += --with-pcre=$(STAGING_DIR)/usr
+	SLANG_DEPENDENCIES += pcre
+else
+	SLANG_CONF_OPT += --with-pcre=no
+endif
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+	SLANG_CONF_OPT += --with-z=$(STAGING_DIR)/usr
+	SLANG_DEPENDENCIES += zlib
 else
-	SLANG_CONF_OPT = ac_cv_path_nc5config=no
+	SLANG_CONF_OPT += --with-z=no
 endif
 
-# The installation location of the slang library
-# does not take into account the DESTDIR directory.
-# So SLANG_INST_LIB is initialized with -L/usr/lib/
-# and slang may be linked with host's libdl.so (if any)
-# Therefore, we have to pass correct installation paths.
-SLANG_INSTALL_STAGING_OPT = \
-	prefix=$(STAGING_DIR)/usr \
-	exec_prefix=$(STAGING_DIR)/usr \
-	DESTDIR=$(STAGING_DIR) \
-	install
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+	SLANG_DEPENDENCIES += ncurses
+else
+	SLANG_CONF_OPT += ac_cv_path_nc5config=no
+endif
 
-SLANG_INSTALL_TARGET_OPT = \
-	prefix=$(STAGING_DIR)/usr \
-	exec_prefix=$(STAGING_DIR)/usr \
-	DESTDIR=$(TARGET_DIR) \
-	install
+ifeq ($(BR2_PACKAGE_READLINE),y)
+	SLANG_CONF_OPT += --with-readline=gnu
+	SLANG_DEPENDENCIES += readline
+endif
 
 $(eval $(autotools-package))
-- 
1.8.3.2

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/2] newt: fix weird indentation
  2014-03-28 23:29 [Buildroot] [PATCH 1/2] newt: fix weird indentation Gustavo Zacarias
  2014-03-28 23:29 ` [Buildroot] [PATCH 2/2] slang: multiple fixes Gustavo Zacarias
@ 2014-03-29  8:06 ` Thomas Petazzoni
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2014-03-29  8:06 UTC (permalink / raw)
  To: buildroot

Dear Gustavo Zacarias,

On Fri, 28 Mar 2014 20:29:19 -0300, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/newt/newt.mk | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)

Both patches applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-29  8:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-28 23:29 [Buildroot] [PATCH 1/2] newt: fix weird indentation Gustavo Zacarias
2014-03-28 23:29 ` [Buildroot] [PATCH 2/2] slang: multiple fixes Gustavo Zacarias
2014-03-29  8:06 ` [Buildroot] [PATCH 1/2] newt: fix weird indentation Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.