diff options
| author |   ILMostro <ilmostro7@gmail.com> | 2018-06-27 10:28:51 -0500 |
|---|---|---|
| committer | ILMostro <ilmostro7@gmail.com> | 2018-06-27 10:28:51 -0500 |
| commit | cadaa7ed6e9ad5e122e0102714f8c0971d1010ca (patch) | |
| tree | 14b22e1f32ef44ce9aedc7a6d10138ec60ef2017 /dev-lang/luajit/files | |
| parent | fixed man-page version file conflict for luajit and eselect-luajit; (diff) | |
| download | ag-ops-cadaa7ed6e9ad5e122e0102714f8c0971d1010ca.tar.gz ag-ops-cadaa7ed6e9ad5e122e0102714f8c0971d1010ca.tar.bz2 ag-ops-cadaa7ed6e9ad5e122e0102714f8c0971d1010ca.zip | |
separate `/usr/lib/luajit-$ver/` for `libluajit` lib files;
`eselect-luajit` takes the new folder into account;
fixed up a few other issues with eselect-luajit; including:
`find_targets()` had been incorrectly changed without taking into account
the additional hyphen (-) between name and version
Diffstat (limited to 'dev-lang/luajit/files')
| -rw-r--r-- | dev-lang/luajit/files/luajit-nosymlinks.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/dev-lang/luajit/files/luajit-nosymlinks.patch b/dev-lang/luajit/files/luajit-nosymlinks.patch index 2a6f494..5d893b2 100644 --- a/dev-lang/luajit/files/luajit-nosymlinks.patch +++ b/dev-lang/luajit/files/luajit-nosymlinks.patch @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 85678ee..1399d81 100644 +index 85678ee..a2e8910 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ DPREFIX= $(DESTDIR)$(PREFIX) @@ -15,14 +15,15 @@ index 85678ee..1399d81 100644 INSTALL_LMOD= $(INSTALL_LMODD)/$(ABIVER) INSTALL_CMODD= $(INSTALL_LIB)/lua INSTALL_CMOD= $(INSTALL_CMODD)/$(ABIVER) -+INSTALL_CMODL= $(INSTALL_CMOD)/luajit-$(VERSION) ++INSTALL_CMODL= $(INSTALL_LIB)/luajit-$(VERSION) INSTALL_MAN= $(INSTALL_SHARE)/man/man1 INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig INSTALL_TNAME= luajit-$(VERSION) -INSTALL_TSYMNAME= luajit INSTALL_ANAME= libluajit-$(ABIVER).a - INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) +-INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) ++INSTALL_SONAME= libluajit-$(ABIVER).so INSTALL_SOSHORT= libluajit-$(ABIVER).so INSTALL_DYLIBNAME= libluajit-$(ABIVER).$(MAJVER).$(MINVER).$(RELVER).dylib INSTALL_DYLIBSHORT1= libluajit-$(ABIVER).dylib @@ -69,7 +70,7 @@ index 85678ee..1399d81 100644 - $(SYMLINK) $(INSTALL_SONAME) $(INSTALL_SHORT2) || : - cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN) + $(LDCONFIG) $(INSTALL_LIB) || : -+ cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)/luajit-$(VERSION).1 ++ cd etc && $(INSTALL_F) $(FILE_MAN) $(INSTALL_MAN)/luajit-$(VERSION) cd etc && $(SED_PC) $(FILE_PC) > $(FILE_PC).tmp && \ $(INSTALL_F) $(FILE_PC).tmp $(INSTALL_PC) && \ $(RM) $(FILE_PC).tmp @@ -81,7 +82,7 @@ index 85678ee..1399d81 100644 uninstall: @echo "==== Uninstalling LuaJIT $(VERSION) from $(PREFIX) ====" - $(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN) $(INSTALL_PC) -+ $(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/$(FILE_MAN)/luajit-$(VERSION).1 $(INSTALL_PC) ++ $(UNINSTALL) $(INSTALL_TSYM) $(INSTALL_T) $(INSTALL_STATIC) $(INSTALL_DYN) $(INSTALL_SHORT1) $(INSTALL_SHORT2) $(INSTALL_MAN)/luajit-$(VERSION) $(INSTALL_PC) for file in $(FILES_JITLIB); do \ $(UNINSTALL) $(INSTALL_JITLIB)/$$file; \ done |