-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
use git submodule for library sources #16
Conversation
6242f8c
to
e50c556
Compare
@cmb69 your help welcome for needed change in P.S. CI is now green for linux |
28d60a2
to
cff1eb9
Compare
We're hitting php/php-src#16843 now (md4c.c and libmd4c/src/md4c.c). To avoid that (fix is unlikely to land for stable PHP versions), might be best to rename md4c.c to php_md4c.c or something. Then a minimal solution for Windows would be: config.w32 | 9 ++++++++-
md4c.c => php_md4c.c | 0
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/config.w32 b/config.w32
index 01b0921..851f590 100644
--- a/config.w32
+++ b/config.w32
@@ -1,5 +1,12 @@
ARG_ENABLE('md4c', 'Enable the md4c extension', 'no');
if (PHP_MD4C != 'no') {
- EXTENSION('md4c', 'md4c.c');
+ EXTENSION('md4c', 'php_md4c.c');
+ ADD_SOURCES(configure_module_dirname + "/libmd4c/src", "\
+ entity.c \
+ md4c.c \
+ md4c-html.c",
+ "md4c"
+ );
+ CHECK_HEADER_ADD_INCLUDE("md4c-html.h", "CFLAGS_MD4C", "libmd4c/src/");
}
diff --git a/md4c.c b/php_md4c.c
similarity index 100%
rename from md4c.c
rename to php_md4c.c That should also be sufficient for CI. That could also be extended to support Also I wonder why there is an explicit |
@cmb69 thanks, applied
Some user may prefer the bundled lib instead of system one, ex: when too old I already think about a 3 states option (yes/no/auto), but IIRC from another ext, this was not a success, probably need to try again @eklausme this PR is now broken because you create the submodule. Feel free to pick what is needed here which have everything needed for linux, windows and CI |
64c5784
to
d7ef61a
Compare
Rebased, and CI is green on Windows and Linux (with bundled or system library) |
@cmb69 see last commit which add "auto" mode
|
Thanks @remicollet, I think the option changes make sense. |
To simply bundled library management, as explained in #7