4th: new package - Patchwork

Message ID	1461174958-14789-1-git-send-email-francois.perrad@gadz.org
State	Changes Requested
Headers	show Return-Path: <buildroot-bounces@busybox.net> From: Francois Perrad <fperrad@gmail.com> To: buildroot@busybox.net Date: Wed, 20 Apr 2016 19:55:58 +0200 Message-Id: <1461174958-14789-1-git-send-email-francois.perrad@gadz.org> Subject: [Buildroot] [PATCH] 4th: new package Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net>

Message ID

1461174958-14789-1-git-send-email-francois.perrad@gadz.org

State

Changes Requested

Headers

From: Francois Perrad <fperrad@gmail.com>
To: buildroot@busybox.net
Date: Wed, 20 Apr 2016 19:55:58 +0200
Message-Id: <1461174958-14789-1-git-send-email-francois.perrad@gadz.org>
Subject: [Buildroot] [PATCH] 4th: new package
Precedence: list
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: buildroot-bounces@busybox.net
Sender: "buildroot" <buildroot-bounces@busybox.net>

Commit Message

Francois Perrad April 20, 2016, 5:55 p.m. UTC

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/4th/0001-fix-Makefile.patch | 27 ++++++++++++++++
 package/4th/4th.hash                |  2 ++
 package/4th/4th.mk                  | 64 +++++++++++++++++++++++++++++++++++++
 package/4th/Config.in               |  8 +++++
 package/Config.in                   |  1 +
 5 files changed, 102 insertions(+)
 create mode 100644 package/4th/0001-fix-Makefile.patch
 create mode 100644 package/4th/4th.hash
 create mode 100644 package/4th/4th.mk
 create mode 100644 package/4th/Config.in

Comments

Thomas Petazzoni June 12, 2016, 7:33 p.m. UTC | #1

Hello,

On Wed, 20 Apr 2016 19:55:58 +0200, Francois Perrad wrote:
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/4th/0001-fix-Makefile.patch | 27 ++++++++++++++++
>  package/4th/4th.hash                |  2 ++
>  package/4th/4th.mk                  | 64 +++++++++++++++++++++++++++++++++++++
>  package/4th/Config.in               |  8 +++++
>  package/Config.in                   |  1 +
>  5 files changed, 102 insertions(+)
>  create mode 100644 package/4th/0001-fix-Makefile.patch
>  create mode 100644 package/4th/4th.hash
>  create mode 100644 package/4th/4th.mk
>  create mode 100644 package/4th/Config.in

I was about to apply your patch, with some minimal changes (see
http://code.bulix.org/i2s65n-101064), but there is one fundamental
license issue here.

The COPYING file, as well as documentation/license.txt contain the
license text of the LGPLv3. But the source code (sources/*.c) all claim
to be licensed under the GPLv3. Only the .4th files are under LGPLv3.

This is clearly not good. Could you talk with upstream to get this
situation resolved?

Also, another comment below.

> diff --git a/package/4th/0001-fix-Makefile.patch b/package/4th/0001-fix-Makefile.patch
> new file mode 100644
> index 0000000..4acc6d3
> --- /dev/null
> +++ b/package/4th/0001-fix-Makefile.patch
> @@ -0,0 +1,27 @@
> +fix Makefile

This is not a proper description. Say what you're fixing, and why.

> +
> +Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> +
> +diff --git a/sources/Makefile b/sources/Makefile
> +index e1b97a5..3a50d0f 100644
> +--- a/sources/Makefile
> ++++ b/sources/Makefile
> +@@ -32,7 +32,6 @@ OBJ4TH = errs_4th.o save_4th.o load_4th.o free_4th.o comp_4th.o \
> + 	name_4th.o dump_4th.o exec_4th.o open_4th.o cgen_4th.o \
> + 	str2cell.o
> + 
> +-.INTERMEDIATE: stage stage.c
> + 
> + all: 4th 4tsh pp4th lib4th
> + 
> +@@ -120,7 +119,7 @@ ifdef SHARED
> + 	ln -sf $(SHARED_LIB) $(LIBRARIES)/lib4th.so
> + endif
> + 
> +-mostlyinstall: libinstall all
> ++mostlyinstall: libinstall
> + 	cp 4th 4tsh pp4th $(BINARIES)
> + 
> + install: mostlyinstall

You're fixing two completely different things here, so two patches are
needed.

Thanks!

Thomas

diff --git a/package/4th/0001-fix-Makefile.patch b/package/4th/0001-fix-Makefile.patch
new file mode 100644
index 0000000..4acc6d3
--- /dev/null
+++ b/package/4th/0001-fix-Makefile.patch
@@ -0,0 +1,27 @@ 
+fix Makefile
+
+Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
+
+diff --git a/sources/Makefile b/sources/Makefile
+index e1b97a5..3a50d0f 100644
+--- a/sources/Makefile
++++ b/sources/Makefile
+@@ -32,7 +32,6 @@ OBJ4TH = errs_4th.o save_4th.o load_4th.o free_4th.o comp_4th.o \
+ 	name_4th.o dump_4th.o exec_4th.o open_4th.o cgen_4th.o \
+ 	str2cell.o
+ 
+-.INTERMEDIATE: stage stage.c
+ 
+ all: 4th 4tsh pp4th lib4th
+ 
+@@ -120,7 +119,7 @@ ifdef SHARED
+ 	ln -sf $(SHARED_LIB) $(LIBRARIES)/lib4th.so
+ endif
+ 
+-mostlyinstall: libinstall all
++mostlyinstall: libinstall
+ 	cp 4th 4tsh pp4th $(BINARIES)
+ 
+ install: mostlyinstall
+-- 
+
diff --git a/package/4th/4th.hash b/package/4th/4th.hash
new file mode 100644
index 0000000..97083da
--- /dev/null
+++ b/package/4th/4th.hash
@@ -0,0 +1,2 @@ 
+# Locally computed:
+sha256  1c7adbb1a56dad4c4c781e6e023d77ac862842560c05246b691d07e9a4460ab2  4th-3.62.4-unix.tar.gz
diff --git a/package/4th/4th.mk b/package/4th/4th.mk
new file mode 100644
index 0000000..9d02b55
--- /dev/null
+++ b/package/4th/4th.mk
@@ -0,0 +1,64 @@ 
+################################################################################
+#
+# 4th
+#
+################################################################################
+
+4TH_VERSION = 3.62.4
+4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz
+4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION)
+4TH_LICENSE = LGPLv3
+4TH_LICENSE_FILES = COPYING
+4TH_DEPENDENCIES = host-4th
+4TH_INSTALL_STAGING = YES
+
+ifeq ($(BR2_STATIC_LIBS),y)
+4TH_MAKE_ENV = STATIC=1
+else
+4TH_MAKE_ENV = SHARED=1
+endif
+
+define 4TH_BUILD_CMDS
+	$(4TH_MAKE_ENV) \
+	$(MAKE) -C $(@D)/sources all \
+		CROSS=$(TARGET_CROSS) \
+		CFLAGS="$(TARGET_CFLAGS) -DUNIX -fsigned-char" \
+		FOURTH=$(HOST_DIR)/usr/bin/4th
+endef
+
+define 4TH_INSTALL_STAGING_CMDS
+	$(4TH_MAKE_ENV) \
+	$(MAKE) -C $(@D)/sources libinstall \
+		LIBRARIES=$(STAGING_DIR)/usr/lib
+	$(INSTALL) -D -m 0644 $(@D)/sources/4th.h \
+		$(STAGING_DIR)/usr/include/4th.h
+endef
+
+define 4TH_INSTALL_TARGET_CMDS
+	$(4TH_MAKE_ENV) \
+	$(MAKE) -C $(@D)/sources mostlyinstall \
+		BINARIES=$(TARGET_DIR)/usr/bin \
+		LIBRARIES=$(TARGET_DIR)/usr/lib
+	mkdir -p $(TARGET_DIR)/usr/share/4th/lib
+	cp -dpf $(@D)/4th/*.4th $(TARGET_DIR)/usr/share/4th
+	cp -dpf $(@D)/4th/lib/*.4th $(TARGET_DIR)/usr/share/4th/lib
+	mkdir -p $(TARGET_DIR)/usr/share/4th/demo
+	cp -dpf $(@D)/4th/demo/*.4th $(TARGET_DIR)/usr/share/4th/demo
+	mkdir -p $(TARGET_DIR)/usr/share/4th/4pp/lib
+	cp -dpf $(@D)/4th/4pp/*.4pp $(TARGET_DIR)/usr/share/4th/4pp
+	cp -dpf $(@D)/4th/4pp/lib/*.4pp $(TARGET_DIR)/usr/share/4th/4pp/lib
+endef
+
+define HOST_4TH_BUILD_CMDS
+	$(MAKE) -C $(@D)/sources all \
+		CFLAGS="$(HOST_CFLAGS) -DUNIX -fsigned-char"
+endef
+
+define HOST_4TH_INSTALL_CMDS
+	$(MAKE) -C $(@D)/sources mostlyinstall \
+		BINARIES=$(HOST_DIR)/usr/bin \
+		LIBRARIES=$(HOST_DIR)/usr/lib
+endef
+
+$(eval $(generic-package))
+$(eval $(host-generic-package))
diff --git a/package/4th/Config.in b/package/4th/Config.in
new file mode 100644
index 0000000..51f85de
--- /dev/null
+++ b/package/4th/Config.in
@@ -0,0 +1,8 @@ 
+config BR2_PACKAGE_4TH
+	bool "4th"
+	help
+	  4tH is a Forth compiler that can create bytecode, C-embeddable
+	  bytecode, standalone executables, but also works fine as a scripting
+	  language
+
+	  http://thebeez.home.xs4all.nl/4tH/
diff --git a/package/Config.in b/package/Config.in
index 64822bf..bd6b4b5 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -474,6 +474,7 @@  endif
 endmenu
 
 menu "Interpreter languages and scripting"
+	source "package/4th/Config.in"
 	source "package/enscript/Config.in"
 	source "package/erlang/Config.in"
 if BR2_PACKAGE_ERLANG