e708f030a5
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> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
18 lines
906 B
Diff
18 lines
906 B
Diff
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
|