jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 06:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/qlibc: bump version to 2.4.1

Browse Source 
This patch depends on http://patchwork.ozlabs.org/patch/624729/

Rebased 0002-obey-destdir.patch using upstream commit.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2016-05-21 10:22:55 +02:00 committed by Thomas Petazzoni
parent c3af51bc06
commit e6b4c46631
3 changed files with 110 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
package/qlibc/0002-obey-destdir.patch
View File

@ -1,90 +1,144 @@
Make sure the Makefile obeys $(DESTDIR) From dbdc772a35244b45c725a72fad5ddade9bd7d521 Mon Sep 17 00:00:00 2001
From: pcarpent <pierre-francois.carpentier@c-s.fr>
Date: Tue, 15 Dec 2015 10:23:44 +0100
Subject: [PATCH] fix makefile
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> add DESTDIR variables in install targets
Index: b/src/Makefile.in Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
=================================================================== (downloaded from upstream commit not included in v2.4.1
https://github.com/wolkykim/qlibc/commit/dbdc772a35244b45c725a72fad5ddade9bd7d521)
---
src/Makefile.in | 110 ++++++++++++++++++++++++++++----------------------------
1 file changed, 55 insertions(+), 55 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index 8a7ab43..4e274ed 100644
--- a/src/Makefile.in --- a/src/Makefile.in
+++ b/src/Makefile.in +++ b/src/Makefile.in
@@ -120,48 +120,48 @@ @@ -122,70 +122,70 @@ qlibcext: ${QLIBCEXT_OBJS}
install: ${INSTALL_TARGETS} install: ${INSTALL_TARGETS}
install-qlibc: qlibc install-qlibc: qlibc
- ${MKDIR_P} ${INST_INCDIR}/qlibc - ${MKDIR_P} ${INST_INCDIR}/qlibc
- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibc.h ${INST_INCDIR}/qlibc/qlibc.h - ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibc.h ${INST_INCDIR}/qlibc/qlibc.h
- ${MKDIR_P} ${INST_INCDIR}/qlibc/containers/
- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qtreetbl.h ${INST_INCDIR}/qlibc/containers/qtreetbl.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhashtbl.h ${INST_INCDIR}/qlibc/containers/qhashtbl.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhasharr.h ${INST_INCDIR}/qlibc/containers/qhasharr.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlisttbl.h ${INST_INCDIR}/qlibc/containers/qlisttbl.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlist.h ${INST_INCDIR}/qlibc/containers/qlist.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qvector.h ${INST_INCDIR}/qlibc/containers/qvector.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qqueue.h ${INST_INCDIR}/qlibc/containers/qqueue.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qstack.h ${INST_INCDIR}/qlibc/containers/qstack.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qgrow.h ${INST_INCDIR}/qlibc/containers/qgrow.h
- ${MKDIR_P} ${INST_INCDIR}/qlibc/utilities/
- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qcount.h ${INST_INCDIR}/qlibc/utilities/qcount.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qencode.h ${INST_INCDIR}/qlibc/utilities/qencode.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qfile.h ${INST_INCDIR}/qlibc/utilities/qfile.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qhash.h ${INST_INCDIR}/qlibc/utilities/qhash.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qio.h ${INST_INCDIR}/qlibc/utilities/qio.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsocket.h ${INST_INCDIR}/qlibc/utilities/qsocket.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qstring.h ${INST_INCDIR}/qlibc/utilities/qstring.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsystem.h ${INST_INCDIR}/qlibc/utilities/qsystem.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qtime.h ${INST_INCDIR}/qlibc/utilities/qtime.h
- ${MKDIR_P} ${INST_INCDIR}/qlibc/ipc/
- ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qsem.h ${INST_INCDIR}/qlibc/ipc/qsem.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qshm.h ${INST_INCDIR}/qlibc/ipc/qshm.h
- ${MKDIR_P} ${INST_LIBDIR} - ${MKDIR_P} ${INST_LIBDIR}
- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_LIBNAME} ${INST_LIBDIR}/${QLIBC_LIBNAME} - ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_LIBNAME} ${INST_LIBDIR}/${QLIBC_LIBNAME}
- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_SLIBREALNAME} ${INST_LIBDIR}/${QLIBC_SLIBREALNAME} - ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_SLIBREALNAME} ${INST_LIBDIR}/${QLIBC_SLIBREALNAME}
- ( cd ${INST_LIBDIR}; ${LN_S} -f ${QLIBC_SLIBREALNAME} ${QLIBC_SLIBNAME} ) - ( cd ${INST_LIBDIR}; ${LN_S} -f ${QLIBC_SLIBREALNAME} ${QLIBC_SLIBNAME} )
+ ${MKDIR_P} ${DESTDIR}/${INST_INCDIR}/qlibc + ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibc.h ${DESTDIR}/${INST_INCDIR}/qlibc/qlibc.h + ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibc.h $(DESTDIR)/${INST_INCDIR}/qlibc/qlibc.h
+ ${MKDIR_P} ${DESTDIR}/${INST_LIBDIR} + ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/containers/
+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_LIBNAME} ${DESTDIR}/${INST_LIBDIR}/${QLIBC_LIBNAME} + ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qtreetbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qtreetbl.h
+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_SLIBREALNAME} ${DESTDIR}/${INST_LIBDIR}/${QLIBC_SLIBREALNAME} + ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhashtbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qhashtbl.h
+ ( cd ${DESTDIR}/${INST_LIBDIR}; ${LN_S} -f ${QLIBC_SLIBREALNAME} ${QLIBC_SLIBNAME} ) + ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhasharr.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qhasharr.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlisttbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qlisttbl.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlist.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qlist.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qvector.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qvector.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qqueue.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qqueue.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qstack.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qstack.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qgrow.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qgrow.h
+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qcount.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qcount.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qencode.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qencode.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qfile.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qfile.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qhash.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qhash.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qio.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qio.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsocket.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qsocket.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qstring.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qstring.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsystem.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qsystem.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qtime.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qtime.h
+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qsem.h $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/qsem.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qshm.h $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/qshm.h
+ ${MKDIR_P} $(DESTDIR)/${INST_LIBDIR}
+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_LIBNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBC_LIBNAME}
+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_SLIBREALNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBREALNAME}
+ ( cd $(DESTDIR)/${INST_LIBDIR}; ${LN_S} -f ${QLIBC_SLIBREALNAME} ${QLIBC_SLIBNAME} )
uninstall-qlibc: uninstall-qlibc:
- ${RM} -f ${INST_INCDIR}/qlibc/qlibc.h - ${RM} -f ${INST_INCDIR}/qlibc/qlibc.h
- ${RM} -rf ${INST_INCDIR}/qlibc/containers
- ${RM} -rf ${INST_INCDIR}/qlibc/utilities
- ${RM} -rf ${INST_INCDIR}/qlibc/ipc
- ${RM} -f ${INST_LIBDIR}/${QLIBC_LIBNAME} - ${RM} -f ${INST_LIBDIR}/${QLIBC_LIBNAME}
- ${RM} -f ${INST_LIBDIR}/${QLIBC_SLIBREALNAME} - ${RM} -f ${INST_LIBDIR}/${QLIBC_SLIBREALNAME}
- ${RM} -f ${INST_LIBDIR}/${QLIBC_SLIBNAME} - ${RM} -f ${INST_LIBDIR}/${QLIBC_SLIBNAME}
+ ${RM} -f ${DESTDIR}/${INST_INCDIR}/qlibc/qlibc.h + ${RM} -f $(DESTDIR)/${INST_INCDIR}/qlibc/qlibc.h
+ ${RM} -f ${DESTDIR}/${INST_LIBDIR}/${QLIBC_LIBNAME} + ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/containers
+ ${RM} -f ${DESTDIR}/${INST_LIBDIR}/${QLIBC_SLIBREALNAME} + ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/utilities
+ ${RM} -f ${DESTDIR}/${INST_LIBDIR}/${QLIBC_SLIBNAME} + ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/ipc
+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_LIBNAME}
+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBREALNAME}
+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBNAME}
install-qlibcext: qlibcext install-qlibcext: qlibcext
- ${MKDIR_P} ${INST_INCDIR}/qlibc - ${MKDIR_P} ${INST_INCDIR}/qlibc
- ${MKDIR_P} ${INST_INCDIR}/qlibc/qlibcext/
- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext.h ${INST_INCDIR}/qlibc/qlibcext.h - ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext.h ${INST_INCDIR}/qlibc/qlibcext.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext/qconfig.h ${INST_INCDIR}/qlibc/qlibcext/qconfig.h - ${MKDIR_P} ${INST_INCDIR}/qlibc/extensions/
- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext/qaconf.h ${INST_INCDIR}/qlibc/qlibcext/qaconf.h - ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qconfig.h ${INST_INCDIR}/qlibc/extensions/qconfig.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext/qlog.h ${INST_INCDIR}/qlibc/qlibcext/qlog.h - ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qaconf.h ${INST_INCDIR}/qlibc/extensions/qaconf.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext/qhttpclient.h ${INST_INCDIR}/qlibc/qlibcext/qhttpclient.h - ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qlog.h ${INST_INCDIR}/qlibc/extensions/qlog.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext/qdatabase.h ${INST_INCDIR}/qlibc/qlibcext/qdatabase.h - ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qhttpclient.h ${INST_INCDIR}/qlibc/extensions/qhttpclient.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qdatabase.h ${INST_INCDIR}/qlibc/extensions/qdatabase.h
- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qtokenbucket.h ${INST_INCDIR}/qlibc/extensions/qtokenbucket.h
- ${MKDIR_P} ${INST_LIBDIR} - ${MKDIR_P} ${INST_LIBDIR}
- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_LIBNAME} ${INST_LIBDIR}/${QLIBCEXT_LIBNAME} - ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_LIBNAME} ${INST_LIBDIR}/${QLIBCEXT_LIBNAME}
- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_SLIBREALNAME} ${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} - ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_SLIBREALNAME} ${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME}
- ( cd ${INST_LIBDIR}; ${LN_S} -f ${QLIBCEXT_SLIBREALNAME} ${QLIBCEXT_SLIBNAME} ) - ( cd ${INST_LIBDIR}; ${LN_S} -f ${QLIBCEXT_SLIBREALNAME} ${QLIBCEXT_SLIBNAME} )
+ ${MKDIR_P} ${DESTDIR}/${INST_INCDIR}/qlibc + ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc
+ ${MKDIR_P} ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/ + ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext.h $(DESTDIR)/${INST_INCDIR}/qlibc/qlibcext.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext.h ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext.h + ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext/qconfig.h ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/qconfig.h + ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qconfig.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qconfig.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext/qaconf.h ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/qaconf.h + ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qaconf.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qaconf.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext/qlog.h ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/qlog.h + ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qlog.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qlog.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext/qhttpclient.h ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/qhttpclient.h + ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qhttpclient.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qhttpclient.h
+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext/qdatabase.h ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/qdatabase.h + ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qdatabase.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qdatabase.h
+ ${MKDIR_P} ${DESTDIR}/${INST_LIBDIR} + ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qtokenbucket.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qtokenbucket.h
+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_LIBNAME} ${DESTDIR}/${INST_LIBDIR}/${QLIBCEXT_LIBNAME} + ${MKDIR_P} $(DESTDIR)/${INST_LIBDIR}
+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_SLIBREALNAME} ${DESTDIR}/${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} + ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_LIBNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_LIBNAME}
+ ( cd ${DESTDIR}/${INST_LIBDIR}; ${LN_S} -f ${QLIBCEXT_SLIBREALNAME} ${QLIBCEXT_SLIBNAME} ) + ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_SLIBREALNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME}
+ ( cd $(DESTDIR)/${INST_LIBDIR}; ${LN_S} -f ${QLIBCEXT_SLIBREALNAME} ${QLIBCEXT_SLIBNAME} )
uninstall-qlibcext: uninstall-qlibcext:
- ${RM} -f ${INST_INCDIR}/qlibc/qlibcext.h - ${RM} -f ${INST_INCDIR}/qlibc/qlibcext.h
- ${RM} -f ${INST_INCDIR}/qlibc/qlibcext/qconfig.h - ${RM} -rf ${INST_INCDIR}/qlibc/extensions
- ${RM} -f ${INST_INCDIR}/qlibc/qlibcext/qaconf.h
- ${RM} -f ${INST_INCDIR}/qlibc/qlibcext/qlog.h
- ${RM} -f ${INST_INCDIR}/qlibc/qlibcext/qhttpclient.h
- ${RM} -f ${INST_INCDIR}/qlibc/qlibcext/qdatabase.h
- ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_LIBNAME} - ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_LIBNAME}
- ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} - ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME}
- ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_SLIBNAME} - ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_SLIBNAME}
+ ${RM} -f ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext.h + ${RM} -f $(DESTDIR)/${INST_INCDIR}/qlibc/qlibcext.h
+ ${RM} -f ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/qconfig.h + ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/extensions
+ ${RM} -f ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/qaconf.h + ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_LIBNAME}
+ ${RM} -f ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/qlog.h + ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME}
+ ${RM} -f ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/qhttpclient.h + ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBNAME}
+ ${RM} -f ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext/qdatabase.h
+ ${RM} -f ${DESTDIR}/${INST_LIBDIR}/${QLIBCEXT_LIBNAME}
+ ${RM} -f ${DESTDIR}/${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME}
+ ${RM} -f ${DESTDIR}/${INST_LIBDIR}/${QLIBCEXT_SLIBNAME}
deinstall: uninstall deinstall: uninstall
uninstall: uninstall-qlibc uninstall-qlibcext uninstall: uninstall-qlibc uninstall-qlibcext
- ${RMDIR} ${INST_INCDIR}/qlibc/qlibcext
- ${RMDIR} ${INST_INCDIR}/qlibc - ${RMDIR} ${INST_INCDIR}/qlibc
+ ${RMDIR} ${DESTDIR}/${INST_INCDIR}/qlibc/qlibcext + ${RMDIR} $(DESTDIR)/${INST_INCDIR}/qlibc
+ ${RMDIR} ${DESTDIR}/${INST_INCDIR}/qlibc
clean: clean:
${RM} -f ${QLIBC_OBJS} ${RM} -f ${QLIBC_OBJS}

11
package/qlibc/0004-md5-fix-musl-build-by-removing-usage-of-internal-gli.patch
View File

@ -9,8 +9,7 @@ http://wiki.musl-libc.org/wiki/FAQ#Q:_I.27m_trying_to_compile_something_against_
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
(Patch for master branch sent upstream: (Patch for master branch sent upstream:
https://github.com/wolkykim/qlibc/pull/53, https://github.com/wolkykim/qlibc/pull/53)
this patch is a backport for v2.1.6)
--- ---
src/internal/md5/md5.h | 10 ++++++---- src/internal/md5/md5.h | 10 ++++++----
src/internal/md5/md5c.c | 1 - src/internal/md5/md5c.c | 1 -
@ -21,7 +20,7 @@ index cbfa7ca..8e726fe 100644
--- a/src/internal/md5/md5.h --- a/src/internal/md5/md5.h
+++ b/src/internal/md5/md5.h +++ b/src/internal/md5/md5.h
@@ -35,9 +35,9 @@ typedef struct MD5Context { @@ -35,9 +35,9 @@ typedef struct MD5Context {
unsigned char buffer[64]; /* input buffer */ unsigned char buffer[64]; /* input buffer */
} MD5_CTX; } MD5_CTX;
-#include <sys/cdefs.h> -#include <sys/cdefs.h>
@ -30,9 +29,9 @@ index cbfa7ca..8e726fe 100644
+#ifdef __cplusplus +#ifdef __cplusplus
+extern "C" { +extern "C" {
+#endif +#endif
void MD5Init (MD5_CTX *); void MD5Init(MD5_CTX *);
void MD5Update (MD5_CTX *, const unsigned char *, unsigned int); void MD5Update(MD5_CTX *, const unsigned char *, unsigned int);
void MD5Final (unsigned char[16], MD5_CTX *); void MD5Final(unsigned char[16], MD5_CTX *);
@@ -45,6 +45,8 @@ char * MD5End(MD5_CTX *, char *); @@ -45,6 +45,8 @@ char * MD5End(MD5_CTX *, char *);
char * MD5File(const char *, char *); char * MD5File(const char *, char *);
char * MD5FileChunk(const char *, char *, off_t, off_t); char * MD5FileChunk(const char *, char *, off_t, off_t);

2
package/qlibc/qlibc.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
QLIBC_VERSION = v2.1.6 QLIBC_VERSION = v2.4.1
QLIBC_SITE = $(call github,wolkykim,qlibc,$(QLIBC_VERSION)) QLIBC_SITE = $(call github,wolkykim,qlibc,$(QLIBC_VERSION))
QLIBC_LICENSE = BSD-2c QLIBC_LICENSE = BSD-2c
QLIBC_LICENSE_FILES = COPYING QLIBC_LICENSE_FILES = COPYING