Commits on Source (5)
-
Hugo Beauzée-Luyssen authoreda2984547
-
This patch enable the writing of the pkg-config file for all platforms and enforce the correct prefix= value in the file. Previously the pkg-config file was never installed for linux platforms so it was using the file detection in the configure.ac, which is the last method of detection. If a newer lua was detected that was not in the contrib file autodetection, it would build the lua contrib but still configure with the newer one, which means that contrib includes will be used and then it will be linked to the detected external lua. In particular, on Archlinux, when using the default lua (5.3) version, the contrib would be built but it will still link lua5.3 which has no symbol for the luaL_register function used when header version is less than or equal to 5.2. With previous change, as `lua >= 5.1` is tested first, contrib will be used first if built whatever the version of lua on the platform, so in the worst case we only build lua from the contrib too often (like previously) instead of failing link on some platforms too. (cherry picked from commit 40174356) Signed-off-by:
Hugo Beauzée-Luyssen <hugo@beauzee.fr>
8eb32da6 -
Hugo Beauzée-Luyssen authored
This will abide by the configured prefix, and install the .pc as any other file instead of copying it manually (cherry picked from commit 46e590f0) Signed-off-by:
Hugo Beauzée-Luyssen <hugo@beauzee.fr>
7367146b -
Hugo Beauzée-Luyssen authored
(cherry picked from commit a828a4f7) Signed-off-by:
Hugo Beauzée-Luyssen <hugo@beauzee.fr>
5880da10 -
Hugo Beauzée-Luyssen authored
We already provide an absolute path, which cmake might try to interpret and convert to an equivalent value. This works, except when we try to replace the prefix we provided by @@CONTRIB_PREFIX@@ in change_prefix.sh, which leads to .pc files being present but unusable (cherry picked from commit 512dd949) Signed-off-by:
Hugo Beauzée-Luyssen <hugo@beauzee.fr>
17a2ed21
Showing
- contrib/src/asdcplib/adding-pkg-config-file.patch 25 additions, 6 deletionscontrib/src/asdcplib/adding-pkg-config-file.patch
- contrib/src/asdcplib/rules.mak 0 additions, 2 deletionscontrib/src/asdcplib/rules.mak
- contrib/src/glew/rules.mak 1 addition, 1 deletioncontrib/src/glew/rules.mak
- contrib/src/lua/rules.mak 2 additions, 2 deletionscontrib/src/lua/rules.mak
- contrib/src/main.mak 1 addition, 1 deletioncontrib/src/main.mak
- contrib/src/zlib/rules.mak 1 addition, 1 deletioncontrib/src/zlib/rules.mak