mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] luaexpat: version bump 1.2.0 -> 1.3.0
@ 2017-09-25 14:49 Denis OSTERLAND
  2017-09-28  9:32 ` [ptxdist] [PATCH v2 0/2] " Denis OSTERLAND
  0 siblings, 1 reply; 4+ messages in thread
From: Denis OSTERLAND @ 2017-09-25 14:49 UTC (permalink / raw)
  To: ptxdist

Remove -ansi flag from Makefile, because lua 5.3.4 is not configured for C89.
Update makefile variables.

Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com>
---
 ...-flag-because-lua-5.3.4-is-not-configured.patch | 23 ++++++++++++++++++++++
 patches/luaexpat-1.3.0/series                      |  4 ++++
 rules/luaexpat.make                                |  8 ++++----
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 patches/luaexpat-1.3.0/0001-Remove-ansi-flag-because-lua-5.3.4-is-not-configured.patch
 create mode 100644 patches/luaexpat-1.3.0/series

diff --git a/patches/luaexpat-1.3.0/0001-Remove-ansi-flag-because-lua-5.3.4-is-not-configured.patch b/patches/luaexpat-1.3.0/0001-Remove-ansi-flag-because-lua-5.3.4-is-not-configured.patch
new file mode 100644
index 0000000..d9bf9f9
--- /dev/null
+++ b/patches/luaexpat-1.3.0/0001-Remove-ansi-flag-because-lua-5.3.4-is-not-configured.patch
@@ -0,0 +1,23 @@
+From: Denis Osterland <Denis.Osterland@diehl.com>
+Date: Mon, 25 Sep 2017 16:41:53 +0200
+Subject: [PATCH] Remove -ansi flag, because lua 5.3.4 is not configured for
+ C89.
+
+Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 8878b6ce61d4..fc6754c3db9f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@ LUA_CDIR	?= /usr/lib/lua/$(LUA_V)
+ T		= lxp
+ LIBNAME		= $(T).so
+ 
+-COMMON_CFLAGS	 = -g -pedantic -Wall -O2 -fPIC -DPIC -ansi
++COMMON_CFLAGS	 = -g -pedantic -Wall -O2 -fPIC -DPIC
+ LUA_INC		?= -I/usr/include/lua$(LUA_V)
+ EXPAT_INC	?= -I/usr/include
+ CF		 = $(LUA_INC) $(EXPAT_INC) $(COMMON_CFLAGS) $(CFLAGS)
diff --git a/patches/luaexpat-1.3.0/series b/patches/luaexpat-1.3.0/series
new file mode 100644
index 0000000..08fb4e1
--- /dev/null
+++ b/patches/luaexpat-1.3.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Remove-ansi-flag-because-lua-5.3.4-is-not-configured.patch
+# 7a6204ee34804c8367779815f05a799b  - git-ptx-patches magic
diff --git a/rules/luaexpat.make b/rules/luaexpat.make
index caccbb6..52ef45a 100644
--- a/rules/luaexpat.make
+++ b/rules/luaexpat.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LUAEXPAT) += luaexpat
 #
 # Paths and names
 #
-LUAEXPAT_VERSION	:= 1.2.0
-LUAEXPAT_MD5		:= 03efe50c7f30a34580701e6527d7bfee
+LUAEXPAT_VERSION	:= 1.3.0
+LUAEXPAT_MD5		:= 3c20b5795e7107f847f8da844fbfe2da
 LUAEXPAT		:= luaexpat-$(LUAEXPAT_VERSION)
 LUAEXPAT_SUFFIX		:= tar.gz
 LUAEXPAT_URL		:= http://matthewwild.co.uk/projects/luaexpat/$(LUAEXPAT).$(LUAEXPAT_SUFFIX)
@@ -34,8 +34,8 @@ LUAEXPAT_CONF_TOOL := NO
 LUAEXPAT_MAKE_OPT := \
 	$(CROSS_ENV_CC) \
 	LUA_VERSION_NUM=501 \
-	LUA_INC=. \
-	EXPAT_INC=.
+	LUA_INC="-I." \
+	EXPAT_INC="-I."
 
 LUAEXPAT_INSTALL_OPT := \
 	$(LUAEXPAT_MAKE_OPT) \
-- 
2.7.4


Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner (Mitglied)
Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
___________________________________________________________________________________________________
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [ptxdist] [PATCH v2 1/2] luaexpat: version bump 1.2.0 -> 1.3.0
  2017-09-28  9:32 ` [ptxdist] [PATCH v2 0/2] " Denis OSTERLAND
  2017-09-28  9:32   ` [ptxdist] [PATCH v2 2/2] luaexpat: Add license information Denis OSTERLAND
@ 2017-09-28  9:32   ` Denis OSTERLAND
  1 sibling, 0 replies; 4+ messages in thread
From: Denis OSTERLAND @ 2017-09-28  9:32 UTC (permalink / raw)
  To: ptxdist

Remove -ansi flag from Makefile, because lua 5.3.4 is not configured for C89.
Update makefile variables.

Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com>
---
 rules/luaexpat.make | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/rules/luaexpat.make b/rules/luaexpat.make
index caccbb6..c06f2fd 100644
--- a/rules/luaexpat.make
+++ b/rules/luaexpat.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LUAEXPAT) += luaexpat
 #
 # Paths and names
 #
-LUAEXPAT_VERSION	:= 1.2.0
-LUAEXPAT_MD5		:= 03efe50c7f30a34580701e6527d7bfee
+LUAEXPAT_VERSION	:= 1.3.0
+LUAEXPAT_MD5		:= 3c20b5795e7107f847f8da844fbfe2da
 LUAEXPAT		:= luaexpat-$(LUAEXPAT_VERSION)
 LUAEXPAT_SUFFIX		:= tar.gz
 LUAEXPAT_URL		:= http://matthewwild.co.uk/projects/luaexpat/$(LUAEXPAT).$(LUAEXPAT_SUFFIX)
@@ -33,14 +33,14 @@ LUAEXPAT_CONF_TOOL := NO
 
 LUAEXPAT_MAKE_OPT := \
 	$(CROSS_ENV_CC) \
-	LUA_VERSION_NUM=501 \
-	LUA_INC=. \
-	EXPAT_INC=.
+	LUA_VERSION_NUM=503 \
+	LUA_INC="-I." \
+	EXPAT_INC="-I."
 
 LUAEXPAT_INSTALL_OPT := \
 	$(LUAEXPAT_MAKE_OPT) \
-	LUA_LIBDIR=$(LUAEXPAT_PKGDIR)/usr/lib/lua/5.1 \
-	LUA_DIR=$(LUAEXPAT_PKGDIR)/usr/share/lua/5.1 \
+	LUA_LIBDIR=$(LUAEXPAT_PKGDIR)/usr/lib/lua/5.3 \
+	LUA_DIR=$(LUAEXPAT_PKGDIR)/usr/share/lua/5.3 \
 	install
 
 # ----------------------------------------------------------------------------
@@ -56,8 +56,8 @@ $(STATEDIR)/luaexpat.targetinstall:
 	@$(call install_fixup, luaexpat,AUTHOR,"Joerg Platte <joerg.platte@googlemail.com>")
 	@$(call install_fixup, luaexpat,DESCRIPTION,missing)
 
-	@$(call install_copy, luaexpat, 0, 0, 0644, -, /usr/share/lua/5.1/lxp/lom.lua)
-	@$(call install_lib, luaexpat, 0, 0, 0644, lua/5.1/lxp)
+	@$(call install_copy, luaexpat, 0, 0, 0644, -, /usr/share/lua/5.3/lxp/lom.lua)
+	@$(call install_lib, luaexpat, 0, 0, 0644, lua/5.3/lxp)
 	@$(call install_finish, luaexpat)
 
 	@$(call touch)
-- 
2.7.4


Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner (Mitglied)
Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
___________________________________________________________________________________________________
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [ptxdist] [PATCH v2 2/2] luaexpat: Add license information.
  2017-09-28  9:32 ` [ptxdist] [PATCH v2 0/2] " Denis OSTERLAND
@ 2017-09-28  9:32   ` Denis OSTERLAND
  2017-09-28  9:32   ` [ptxdist] [PATCH v2 1/2] luaexpat: version bump 1.2.0 -> 1.3.0 Denis OSTERLAND
  1 sibling, 0 replies; 4+ messages in thread
From: Denis OSTERLAND @ 2017-09-28  9:32 UTC (permalink / raw)
  To: ptxdist

README tells luaexpact use Lua license, so use license information from Lua.

Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com>
---
 rules/luaexpat.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/luaexpat.make b/rules/luaexpat.make
index c06f2fd..47b12e6 100644
--- a/rules/luaexpat.make
+++ b/rules/luaexpat.make
@@ -23,7 +23,7 @@ LUAEXPAT_SUFFIX		:= tar.gz
 LUAEXPAT_URL		:= http://matthewwild.co.uk/projects/luaexpat/$(LUAEXPAT).$(LUAEXPAT_SUFFIX)
 LUAEXPAT_SOURCE		:= $(SRCDIR)/$(LUAEXPAT).$(LUAEXPAT_SUFFIX)
 LUAEXPAT_DIR		:= $(BUILDDIR)/$(LUAEXPAT)
-LUAEXPAT_LICENSE	:= unknown
+LUAEXPAT_LICENSE	= $(LUA_LICENSE)
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.7.4


Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner (Mitglied)
Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
___________________________________________________________________________________________________
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [ptxdist] [PATCH v2 0/2] luaexpat: version bump 1.2.0 -> 1.3.0
  2017-09-25 14:49 [ptxdist] [PATCH] luaexpat: version bump 1.2.0 -> 1.3.0 Denis OSTERLAND
@ 2017-09-28  9:32 ` Denis OSTERLAND
  2017-09-28  9:32   ` [ptxdist] [PATCH v2 2/2] luaexpat: Add license information Denis OSTERLAND
  2017-09-28  9:32   ` [ptxdist] [PATCH v2 1/2] luaexpat: version bump 1.2.0 -> 1.3.0 Denis OSTERLAND
  0 siblings, 2 replies; 4+ messages in thread
From: Denis OSTERLAND @ 2017-09-28  9:32 UTC (permalink / raw)
  To: ptxdist


v2:
 - Adapt install directory form 5.1 to 5.3
 - Adapt LUA_VERSION define from 501 to 503

Diehl AKO Stiftung & Co. KG, Pfannerstraße 75-83, 88239 Wangen im Allgäu
Bereichsvorstand: Dipl.-Ing. Michael Siedentop (Sprecher), Josef Fellner (Mitglied)
Sitz der Gesellschaft: Wangen i.A. – Registergericht: Amtsgericht Ulm HRA 620609 – Persönlich haftende Gesellschafterin: Diehl Verwaltungs-Stiftung – Sitz: Nürnberg – Registergericht: Amtsgericht Nürnberg HRA 11756 –
Vorstand: Dr.-Ing. E.h. Thomas Diehl (†) (Vorsitzender), Herr Dipl.-Wirtsch.-Ing. Wolfgang Weggen (stellvertretender Vorsitzender), Dipl.-Kfm. Claus Günther, Dipl.-Kfm. Frank Gutzeit, Dr.-Ing. Heinrich Schunk, Dr.-Ing. Michael Siedentop , Dipl.-Kfm. Dr.-Ing. Martin Sommer, Dipl.-Ing. (FH) Rainer von Borstel, Vorsitzender des Aufsichtsrates: Dr. Klaus Maier
___________________________________________________________________________________________________
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht. Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-09-28  9:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-25 14:49 [ptxdist] [PATCH] luaexpat: version bump 1.2.0 -> 1.3.0 Denis OSTERLAND
2017-09-28  9:32 ` [ptxdist] [PATCH v2 0/2] " Denis OSTERLAND
2017-09-28  9:32   ` [ptxdist] [PATCH v2 2/2] luaexpat: Add license information Denis OSTERLAND
2017-09-28  9:32   ` [ptxdist] [PATCH v2 1/2] luaexpat: version bump 1.2.0 -> 1.3.0 Denis OSTERLAND

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox