diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-25 04:56:21 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-02-25 21:48:07 +0100 |
| commit | cc5101872d1a92bc28f9ced28642d0073bdbb9f4 (patch) | |
| tree | 9551e456cf9b4eed9a4223d9deee2dca7500aa41 /patches/lua-5.3.4 | |
| parent | 5f5f841d95a21f1ce1d2c1baff5318424c3d6e02 (diff) | |
| download | ptxdist-cc5101872d1a92bc28f9ced28642d0073bdbb9f4.tar.gz ptxdist-cc5101872d1a92bc28f9ced28642d0073bdbb9f4.tar.xz | |
lua: set correct soname for the library
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/lua-5.3.4')
| -rw-r--r-- | patches/lua-5.3.4/0001-Cross-compile-in-ptxdist-envirionment.patch | 13 | ||||
| -rw-r--r-- | patches/lua-5.3.4/0002-Install-pkgconfig-file.patch | 9 |
2 files changed, 12 insertions, 10 deletions
diff --git a/patches/lua-5.3.4/0001-Cross-compile-in-ptxdist-envirionment.patch b/patches/lua-5.3.4/0001-Cross-compile-in-ptxdist-envirionment.patch index 52883f337..859d18ce1 100644 --- a/patches/lua-5.3.4/0001-Cross-compile-in-ptxdist-envirionment.patch +++ b/patches/lua-5.3.4/0001-Cross-compile-in-ptxdist-envirionment.patch @@ -4,12 +4,12 @@ Subject: [PATCH] Cross-compile in ptxdist envirionment. Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> --- - Makefile | 9 ++++++--- + Makefile | 10 +++++++--- src/Makefile | 18 ++++++++++-------- - 2 files changed, 16 insertions(+), 11 deletions(-) + 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile -index 119110d2f010..2b2968449fb5 100644 +index 119110d2f010..c40c4cd6e0f7 100644 --- a/Makefile +++ b/Makefile @@ -4,13 +4,13 @@ @@ -37,18 +37,19 @@ index 119110d2f010..2b2968449fb5 100644 test: dummy src/lua -v -@@ -62,6 +62,9 @@ install: dummy +@@ -62,6 +62,10 @@ install: dummy cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) + cd src && $(INSTALL_EXEC) liblua.so.$R $(INSTALL_LIB) + ln -s liblua.so.$R $(INSTALL_LIB)/liblua.so.$V ++ ln -s liblua.so.$R $(INSTALL_LIB)/liblua.so.$(basename $V) + ln -s liblua.so.$V $(INSTALL_LIB)/liblua.so cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) uninstall: diff --git a/src/Makefile b/src/Makefile -index d71c75c87322..ef1760d65225 100644 +index d71c75c87322..8ad9a1b718ad 100644 --- a/src/Makefile +++ b/src/Makefile @@ -4,15 +4,13 @@ @@ -98,7 +99,7 @@ index d71c75c87322..ef1760d65225 100644 $(RANLIB) $@ +$(LUA_SO): $(BASE_O) -+ $(CC) -shared -o $@ $(BASE_O) $(filter-out %readline, $(LIBS)) ++ $(CC) -shared -Wl,-soname=liblua.so.$(basename $V) -o $@ $(BASE_O) $(filter-out %readline, $(LIBS)) + $(LUA_T): $(LUA_O) $(LUA_A) $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) diff --git a/patches/lua-5.3.4/0002-Install-pkgconfig-file.patch b/patches/lua-5.3.4/0002-Install-pkgconfig-file.patch index 5717178af..ca02e3804 100644 --- a/patches/lua-5.3.4/0002-Install-pkgconfig-file.patch +++ b/patches/lua-5.3.4/0002-Install-pkgconfig-file.patch @@ -10,10 +10,10 @@ Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com> create mode 100644 lua.pc.in diff --git a/Makefile b/Makefile -index 2b2968449fb5..0ecd0198169f 100644 +index c40c4cd6e0f7..179246813af2 100644 --- a/Makefile +++ b/Makefile -@@ -57,14 +57,15 @@ $(PLATS) clean: +@@ -57,8 +57,8 @@ $(PLATS) clean: test: dummy src/lua -v @@ -24,14 +24,15 @@ index 2b2968449fb5..0ecd0198169f 100644 cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd src && $(INSTALL_EXEC) liblua.so.$R $(INSTALL_LIB) +@@ -66,6 +66,7 @@ install: dummy ln -s liblua.so.$R $(INSTALL_LIB)/liblua.so.$V + ln -s liblua.so.$R $(INSTALL_LIB)/liblua.so.$(basename $V) ln -s liblua.so.$V $(INSTALL_LIB)/liblua.so + $(INSTALL_DATA) lua.pc $(INSTALL_LIB)/pkgconfig cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) uninstall: -@@ -111,6 +112,9 @@ pc: +@@ -112,6 +113,9 @@ pc: @echo "libdir=$(INSTALL_LIB)" @echo "includedir=$(INSTALL_INC)" |