[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: stop lua from blocking pkgconfig path

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
3523bd1a by Khalid Masum at 2024-05-18T14:42:11+00:00
contrib: stop lua from blocking pkgconfig path

If $PREFIX/lib/pkgconfig/ directory already not created, lua puts lua.pc
as $PREFIX/lib/pkgconfig file. Therefore $PREFIX/lib/pkgconfig cannot be
created or used by any other contrib tools.

This causes various other tools that need to put pkgconfig in that
directory (including lua itself) fail to finish the building process.

Fix this by creating a pkgconfig directory if it does not exist before
lua build tries to copy pkgconfig there.

- - - - -
0346060d by Khalid Masum at 2024-05-18T14:42:11+00:00
contrib: lua: Remove unwanted make-entry string from lua.pc

Currently, when creating lua.pc, unwanted strings are added into the
file, for example, inspecting a lua.pc file from
$PREFIX/lib/pkgconfig/lua.pc gives:

make[2]: Entering directory 'foo/bar'
<intended lua.pc content here>
make[2]: Leaving directory 'foo/bar'

Mitigate this by using --no-print-directory flag when running the internal
make command from its Makefile.

- - - - -


1 changed file:

- contrib/src/lua/Create-and-install-a-.pc-file.patch


Changes:

=====================================
contrib/src/lua/Create-and-install-a-.pc-file.patch
=====================================
@@ -33,11 +33,12 @@ index f3bf10c..3e327ee 100644
  
 -install: dummy
 +lua.pc:
-+	$(MAKE) pc > lua.pc
++	$(MAKE) --no-print-directory pc > lua.pc
 +
 +
 +install: dummy $(TO_PKGCONFIG)
- 	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
+-	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
++	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) $(INSTALL_LIB_PKGCONFIG)
  	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
  	cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
  	cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/09736fa6060667b9a86d86c2541447a696a78f82...0346060dd5c80ddb4286d2a9fd25c76aacc2a9c5

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/09736fa6060667b9a86d86c2541447a696a78f82...0346060dd5c80ddb4286d2a9fd25c76aacc2a9c5
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance