[packages/clinkc] - new - libtool patch to restore libtool support - iconv patch to avoid looking for libiconv if icon

qboosh qboosh at pld-linux.org
Fri Mar 5 18:33:35 CET 2021


commit 1b808a78bb0bfc9c08e69b43d07493b68d568ed5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Mar 5 18:34:21 2021 +0100

    - new
    - libtool patch to restore libtool support
    - iconv patch to avoid looking for libiconv if iconv() is found in libc
    - doc patch not to require doxygen docs for not built objc wrapper

 clinkc-doc.patch     |  12 ++++++
 clinkc-iconv.patch   |  11 ++++++
 clinkc-libtool.patch | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 130 insertions(+)
---
diff --git a/clinkc-doc.patch b/clinkc-doc.patch
new file mode 100644
index 0000000..fa4c94a
--- /dev/null
+++ b/clinkc-doc.patch
@@ -0,0 +1,12 @@
+--- clinkc/Makefile.am.orig	2010-02-23 17:26:21.000000000 +0100
++++ clinkc/Makefile.am	2021-03-04 21:43:18.688802614 +0100
+@@ -26,8 +26,7 @@
+ 	Doxyfile
+ 
+ nobase_devdocs_DATA = \
+-	doxygen/html/* \
+-	doxygen-objc/html/*
++	doxygen/html/*
+ 
+ doxygen/html/*:
+ 	cd $(srcdir) && doxygen Doxyfile
diff --git a/clinkc-iconv.patch b/clinkc-iconv.patch
new file mode 100644
index 0000000..f04e317
--- /dev/null
+++ b/clinkc-iconv.patch
@@ -0,0 +1,11 @@
+--- clinkc/configure.in.orig	2021-03-04 20:48:30.769948133 +0100
++++ clinkc/configure.in	2021-03-04 20:57:39.143644005 +0100
+@@ -393,7 +393,7 @@
+ 
+ AC_CHECK_FUNCS([iconv])
+ AC_CHECK_HEADERS([iconv.h])
+-AC_CHECK_LIB([iconv],[main])
++AC_SEARCH_LIBS([iconv], [iconv])
+ 
+ ##############################
+ # Checks for pthread
diff --git a/clinkc-libtool.patch b/clinkc-libtool.patch
new file mode 100644
index 0000000..13550bf
--- /dev/null
+++ b/clinkc-libtool.patch
@@ -0,0 +1,107 @@
+--- clinkc/configure.in.orig	2010-08-17 14:15:44.000000000 +0200
++++ clinkc/configure.in	2021-03-04 20:48:30.769948133 +0100
+@@ -62,7 +62,7 @@
+ AC_PROG_CC
++AC_LANG_CPLUSPLUS
+ AC_PROG_INSTALL
+ AC_PROG_AWK
+-#AC_PROG_LIBTOOL
++AC_PROG_LIBTOOL
+ AC_PROG_RANLIB
+-AC_LANG_CPLUSPLUS
+ AM_PROG_CC_C_O
+--- clinkc/lib/unix/Makefile.am.orig	2010-02-02 15:50:42.000000000 +0100
++++ clinkc/lib/unix/Makefile.am	2021-03-04 20:51:45.318894171 +0100
+@@ -1,8 +1,8 @@
+-#if HAVE_LIBTOOL
+-#lib_LTLIBRARIES = libclinkc.la
+-#else
++if HAVE_LIBTOOL
++lib_LTLIBRARIES = libclinkc.la
++else
+ lib_LIBRARIES = libclinkc.a
+-#endif
++endif
+ 
+ INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include @XML_CFLAGS@ @HTTP_CFLAGS@ @CLOG_DEBUG_FLAGS@
+ 
+@@ -112,13 +112,13 @@
+ nobase_libclinkcinclude_HEADERS =  \
+         $(clinkc_header)
+ 
+-#if HAVE_LIBTOOL
+-#libclinkc_la_SOURCES = \
+-#        $(clinkc_source)
+-#libclinkc_la_LIBADD = @HTTP_LIBS@ @XML_LIBS@
+-#else
++if HAVE_LIBTOOL
++libclinkc_la_SOURCES = \
++        $(clinkc_source)
++libclinkc_la_LIBADD = @HTTP_LIBS@ @XML_LIBS@
++else
+ libclinkc_a_SOURCES = \
+         $(clinkc_source)
+ libclinkc_a_CFLAGS = $(AM_CFLAGS)
+ libclinkc_a_LIBADD = @HTTP_LIBS@ @XML_LIBS@
+-#endif
++endif
+--- clinkc/sample/clock/unix/Makefile.am.orig	2010-02-02 15:50:42.000000000 +0100
++++ clinkc/sample/clock/unix/Makefile.am	2021-03-04 20:52:39.021936570 +0100
+@@ -15,8 +15,8 @@
+ 	../clock_device.c \
+ 	../../common/kb_util.c
+ 
+-#if HAVE_LIBTOOL
+-#upnpclock_LDADD = ../../../lib/unix/libclinkc.la @XML_LIBS@
+-#else
++if HAVE_LIBTOOL
++upnpclock_LDADD = ../../../lib/unix/libclinkc.la @XML_LIBS@
++else
+ upnpclock_LDADD = ../../../lib/unix/libclinkc.a @XML_LIBS@
+-#endif
++endif
+--- clinkc/sample/upnpavdump/unix/Makefile.am.orig	2010-02-02 15:50:42.000000000 +0100
++++ clinkc/sample/upnpavdump/unix/Makefile.am	2021-03-04 20:53:00.541819987 +0100
+@@ -11,8 +11,8 @@
+ 	../upnpavdump.c \
+ 	../../common/kb_util.c
+ 
+-#if HAVE_LIBTOOL
+-#upnpavdump_LDADD = ../../../lib/unix/libclinkc.la @XML_LIBS@
+-#else
++if HAVE_LIBTOOL
++upnpavdump_LDADD = ../../../lib/unix/libclinkc.la @XML_LIBS@
++else
+ upnpavdump_LDADD = ../../../lib/unix/libclinkc.a @XML_LIBS@
+-#endif
++endif
+--- clinkc/sample/upnpdump/unix/Makefile.am.orig	2010-02-02 15:50:42.000000000 +0100
++++ clinkc/sample/upnpdump/unix/Makefile.am	2021-03-04 20:53:21.415040240 +0100
+@@ -11,8 +11,8 @@
+ 	../upnpdump.c \
+ 	../../common/kb_util.c
+ 
+-#if HAVE_LIBTOOL
+-#upnpdump_LDADD = ../../../lib/unix/libclinkc.la @XML_LIBS@
+-#else
++if HAVE_LIBTOOL
++upnpdump_LDADD = ../../../lib/unix/libclinkc.la @XML_LIBS@
++else
+ upnpdump_LDADD = ../../../lib/unix/libclinkc.a @XML_LIBS@
+-#endif
++endif
+--- clinkc/sample/upnpigddump/unix/Makefile.am.orig	2010-02-02 15:50:42.000000000 +0100
++++ clinkc/sample/upnpigddump/unix/Makefile.am	2021-03-04 20:53:36.471625339 +0100
+@@ -11,8 +11,8 @@
+ 	../upnpigddump.c \
+ 	../../common/kb_util.c
+ 
+-#if HAVE_LIBTOOL
+-#upnpigddump_LDADD = ../../../lib/unix/libclinkc.la @XML_LIBS@
+-#else
++if HAVE_LIBTOOL
++upnpigddump_LDADD = ../../../lib/unix/libclinkc.la @XML_LIBS@
++else
+ upnpigddump_LDADD = ../../../lib/unix/libclinkc.a @XML_LIBS@
+-#endif
++endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/clinkc.git/commitdiff/1b808a78bb0bfc9c08e69b43d07493b68d568ed5



More information about the pld-cvs-commit mailing list