diff options
author | Sagaert Johan <sagaert.johan@skynet.be> | 2014-10-12 15:12:11 +0200 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2014-10-12 16:23:46 +0200 |
commit | 48d4c312ae3d1aee402d9ad67aaae93267c92336 (patch) | |
tree | c89d209d30794e961786a0acc85305c7cf16e59b /package/qlibc/qlibc-0003-fix-openssl-mysql-checks.patch | |
parent | 2f0748578166a4717bbbb941cf768f4dca75e971 (diff) | |
download | buildroot-48d4c312ae3d1aee402d9ad67aaae93267c92336.tar.gz buildroot-48d4c312ae3d1aee402d9ad67aaae93267c92336.zip |
qlibc : new package
[Thomas:
- add dependency on threads, wchar and dynamic librayr
- add dependency on libiconv when locale support is not enabled
- replace patch hacking includedir by a patch that lets the Makefile
obey to $(DESTDIR)
- remove optional OpenSSL and MySQL support which simply cannot work
due to the usage of AC_CHECK_FILE() in configure.ac, this required
an additional patch to fix the bogus AC_ARG_WITH() calls.
- move from 'Miscellaneous' to 'Libraries' -> 'Other'.
- fixup the licensing information.]
Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qlibc/qlibc-0003-fix-openssl-mysql-checks.patch')
-rw-r--r-- | package/qlibc/qlibc-0003-fix-openssl-mysql-checks.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/package/qlibc/qlibc-0003-fix-openssl-mysql-checks.patch b/package/qlibc/qlibc-0003-fix-openssl-mysql-checks.patch new file mode 100644 index 0000000000..bb609b2446 --- /dev/null +++ b/package/qlibc/qlibc-0003-fix-openssl-mysql-checks.patch @@ -0,0 +1,36 @@ +Allow to explicitly disable openssl and mysql + +AC_ARG_WITH() is being incorrectly used: the third argument indicates +the action that needs to be taken when a value was passed, when not +the option is enabled. Therefore, the result of the existing code was +that when you passed --without-mysql or --without-openssl, the +$withval variable would get the value 'yes', which is obviously wrong. + +Instead, we simply empty this third argument, because $withval is +already properly filled with 'yes' or 'no' by the AC_ARG_WITH() +function. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/configure.ac +=================================================================== +--- a/configure.ac ++++ b/configure.ac +@@ -170,7 +170,7 @@ + ## --with section + ## + +-AC_ARG_WITH([openssl],[AS_HELP_STRING([--with-openssl], [This will enable HTTPS support in qhttpclient extension API. When it's enabled, user applications will need to link openssl library with -lssl option.])],[withval=yes],[withval=no]) ++AC_ARG_WITH([openssl],[AS_HELP_STRING([--with-openssl], [This will enable HTTPS support in qhttpclient extension API. When it's enabled, user applications will need to link openssl library with -lssl option.])],[],[withval=no]) + if test "$withval" = yes; then + if test "$with_openssl" = yes; then + with_openssl="/usr/include" +@@ -185,7 +185,7 @@ + fi + fi + +-AC_ARG_WITH([mysql],[AS_HELP_STRING([--with-mysql], [This will enable MySQL database support in qdatabase extension API. When it's enabled, user applications need to link mysql client library. (ex: -lmysqlclient)])],[withval=yes],[withval=no]) ++AC_ARG_WITH([mysql],[AS_HELP_STRING([--with-mysql], [This will enable MySQL database support in qdatabase extension API. When it's enabled, user applications need to link mysql client library. (ex: -lmysqlclient)])],[],[withval=no]) + if test "$withval" = yes; then + if test "$with_mysql" = yes; then + with_mysql="/usr/include/mysql" |