Skip to contentSkip to conversation

newt: fix weird indentation

PATCH New Gustavo Zacarias 2 participants 3 messages Mar 28, 2014 – Mar 29, 2014

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/2 newt: fix weird indentation

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/newt/newt.mk | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
package/newt/newt.mk +6 -8
index b567156..85e75f4 100644
@@ -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))
Signature · 1 line
1.8.3.2
author
#1 lore raw

PATCH 2/2 slang: multiple fixes

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 <[email protected]>
---
 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
package/slang/slang-01-slsh-libs.patch new file +17 -0
new file mode 100644
index 0000000..e8b6e6d
@@ -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 <[email protected]>
+
+--- 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
package/slang/slang.mk +26 -18

53 lines not on this page · raw message

Signature · 1 line
1.8.3.2
#2 lore raw

PATCH 1/2 newt: fix weird indentation

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 4 lines · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/newt/newt.mk | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Both patches applied, thanks.

Thomas

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