NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

newt: convert to autotools-package infra

Browse Source 
[Peter: drop uneeded configure args, full install to target]
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Samuel Martin 2012-10-11 09:46:39 +00:00 committed by Peter Korsgaard
parent 0a227142c9
commit a34896a8d7
2 changed files with 66 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
package/newt/newt-fix-makefile.patch Normal file
View File

@ -0,0 +1,42 @@
Fix Makefile.in
* Remove -Os from the CFLAGS (already handled by Buildroot)
* Use $(CC) instead of $(CPP) to generate .depend file because
'$(CPP) -M' call does not support multiple input files.
This avoid the following error:
make[1]: Entering directory `/opt/br/output/build/newt-0.51.0'
/opt/br/output/host/usr/bin/arm-none-linux-gnueabi-cpp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -M newt.c button.c form.c checkbox.c entry.c label.c listbox.c scrollbar.c textbox.c scale.c grid.c windows.c buttonbar.c checkboxtree.c > .depend
arm-none-linux-gnueabi-cpp: too many input files
make[1]: *** [depend] Error 1
make[1]: Leaving directory
`/opt/br/output/build/newt-0.51.0'
make: ***
[/opt/br/output/build/newt-0.51.0/.stamp_built] Error 2
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
Index: newt-0.51.0/Makefile.in
===================================================================
--- newt-0.51.0.orig/Makefile.in 2012-10-10 22:43:42.042318041 +0200
+++ newt-0.51.0/Makefile.in 2012-10-11 21:25:44.063873277 +0200
@@ -3,7 +3,7 @@ SHLIBS = -lslang -lm -lc
GPM_SUPPORT=@gpm_support@
-CFLAGS = -Wall -Os -D_GNU_SOURCE
+CFLAGS += -D_GNU_SOURCE
VERSION = @VERSION@
CVSTAG = r$(subst .,-,$(VERSION))
@@ -86,7 +86,7 @@ clean:
$(SHAREDOBJS) *.so*
depend:
- $(CPP) $(CFLAGS) -M $(SOURCES) > .depend
+ $(CC) $(CFLAGS) -M $(SOURCES) > .depend
$(SHAREDDIR):
mkdir -p $(SHAREDDIR)

96
package/newt/newt.mk
View File

@ -3,80 +3,32 @@
# newt
#
#############################################################
NEWT_SOURCE=newt-0.51.0.tar.bz2
NEWT_CAT:=$(BZCAT)
NEWT_SITE=http://www.uclibc.org/
NEWT_DIR=$(BUILD_DIR)/newt-0.51.0
NEWT_VERSION=0.51.0
NEWT_CFLAGS=-Os -g -fPIC
NEWT_VERSION = 0.51.0
NEWT_SITE = http://www.uclibc.org/
NEWT_SOURCE = newt-$(NEWT_VERSION).tar.bz2
NEWT_LICENSE = GPLv2
NEWT_LICENSE_FILES = COPYING
NEWT_INSTALL_STAGING = YES
$(DL_DIR)/$(NEWT_SOURCE):
$(call DOWNLOAD,$(NEWT_SITE)/$(NEWT_SOURCE))
NEWT_DEPENDENCIES = slang
$(NEWT_DIR)/.source: $(DL_DIR)/$(NEWT_SOURCE)
$(NEWT_CAT) $(DL_DIR)/$(NEWT_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
touch $(NEWT_DIR)/.source
NEWT_MAKE_ENV += $(TARGET_CONFIGURE_OPTS)
NEWT_MAKE = $(MAKE1)
$(NEWT_DIR)/.configured: $(NEWT_DIR)/.source
(cd $(NEWT_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" \
./configure $(QUIET) \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
--libdir=/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
$(DISABLE_NLS) \
)
touch $(NEWT_DIR)/.configured
define NEWT_INSTALL_STAGING_CMDS
$(INSTALL) -D -m644 $(@D)/newt.h $(STAGING_DIR)/usr/include/newt.h
$(INSTALL) -D -m644 $(@D)/libnewt.a $(STAGING_DIR)/usr/lib/libnewt.a
$(INSTALL) -m755 $(@D)/libnewt.so* $(STAGING_DIR)/usr/lib/
ln -fs libnewt.so.$(NEWT_VERSION) $(STAGING_DIR)/usr/lib/libnewt.so
ln -fs libnewt.so.$(NEWT_VERSION) $(STAGING_DIR)/usr/lib/libnewt.so.0.51
endef
$(NEWT_DIR)/libnewt.so.$(NEWT_VERSION): $(NEWT_DIR)/.configured
$(MAKE1) CFLAGS="$(TARGET_CFLAGS) $(NEWT_CFLAGS)" CC="$(TARGET_CC)" -C $(NEWT_DIR)
touch -c $@
define NEWT_INSTALL_TARGET_CMDS
$(INSTALL) -D -m644 $(@D)/newt.h $(TARGET_DIR)/usr/include/newt.h
$(INSTALL) -D -m644 $(@D)/libnewt.a $(TARGET_DIR)/usr/lib/libnewt.a
$(INSTALL) -m755 $(@D)/libnewt.so* $(TARGET_DIR)/usr/lib/
ln -fs libnewt.so.$(NEWT_VERSION) $(TARGET_DIR)/usr/lib/libnewt.so
ln -fs libnewt.so.$(NEWT_VERSION) $(TARGET_DIR)/usr/lib/libnewt.so.0.51
endef
$(STAGING_DIR)/usr/lib/libnewt.a: $(NEWT_DIR)/libnewt.so.$(NEWT_VERSION)
cp -a $(NEWT_DIR)/libnewt.a $(STAGING_DIR)/usr/lib/
cp -a $(NEWT_DIR)/newt.h $(STAGING_DIR)/usr/include/
cp -a $(NEWT_DIR)/libnewt.so* $(STAGING_DIR)/usr/lib/
(cd $(STAGING_DIR)/usr/lib; ln -fs libnewt.so.$(NEWT_VERSION) libnewt.so)
(cd $(STAGING_DIR)/usr/lib; ln -fs libnewt.so.$(NEWT_VERSION) libnewt.so.0.51)
touch -c $@
$(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION): $(STAGING_DIR)/usr/lib/libnewt.a
cp -a $(STAGING_DIR)/usr/lib/libnewt.so* $(TARGET_DIR)/usr/lib/
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libnewt.so*
touch -c $@
newt-legal-info:
@$(call legal-warning-pkg,newt,legal-info not yet implemented)
newt: slang $(TARGET_DIR)/usr/lib/libnewt.so.$(NEWT_VERSION)
newt-source: $(DL_DIR)/$(NEWT_SOURCE)
newt-clean:
rm -f $(TARGET_DIR)/usr/lib/libnewt.so*
-$(MAKE) -C $(NEWT_DIR) clean
newt-dirclean: slang-dirclean
rm -rf $(NEWT_DIR)
#############################################################
#
# Toplevel Makefile options
#
#############################################################
ifeq ($(BR2_PACKAGE_NEWT),y)
TARGETS+=newt
endif
$(eval $(autotools-package))