[ptxdist] [PATCH 1/6] libconfig: new package

mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed

* [ptxdist] [PATCH 1/6] libconfig: new package
@ 2014-07-21  9:52 Guillaume Gourat
  2014-07-21  9:52 ` [ptxdist] [PATCH 2/6] libevent: version bump 2.0.10 -> 2.0.21 Guillaume Gourat
                   ` (5 more replies)
  0 siblings, 6 replies; 9+ messages in thread
From: Guillaume Gourat @ 2014-07-21  9:52 UTC (permalink / raw)
  To: ptxdist; +Cc: Guillaume GOURAT

From: Guillaume GOURAT <guillaume.gourat@nexvision.fr>


Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
---
 rules/libconfig.in   |   27 ++++++++++++++++++++++
 rules/libconfig.make |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 rules/libconfig.in
 create mode 100644 rules/libconfig.make

diff --git a/rules/libconfig.in b/rules/libconfig.in
new file mode 100644
index 0000000..286668a
--- /dev/null
+++ b/rules/libconfig.in
@@ -0,0 +1,27 @@
+## SECTION=system_libraries
+
+menuconfig LIBCONFIG
+	tristate
+	prompt "libconfig                     "
+	select LIBC_M
+	select GCCLIBS_GCC_S
+	select GCCLIBS_CXX
+	help
+	  Libconfig is a simple library for processing structured configuration
+	  files. Libconfig is very compact, a fraction of the size of the expat
+	  XML parser library. This makes it well-suited for memory-constrained
+	  systems like handheld devices.
+
+          See http://www.hyperrealm.com/libconfig/ for info about it.
+
+if LIBCONFIG
+ 
+config LIBCONFIG_INSTALL_LIBCONFIG_SO
+	bool
+	prompt "Install libconfig on the target"
+
+config LIBCONFIG_INSTALL_LIBCONFIGPP_SO
+	bool
+	prompt "Install libconfig++ on the target"
+
+endif
diff --git a/rules/libconfig.make b/rules/libconfig.make
new file mode 100644
index 0000000..26919d3
--- /dev/null
+++ b/rules/libconfig.make
@@ -0,0 +1,63 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Guillaume Gourat <guillaume.gourat@nexvision.fr> 
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBCONFIG) += libconfig
+
+#
+# Paths and names
+#
+LIBCONFIG_VERSION	:= 1.4.9
+LIBCONFIG_MD5	:= b6ee0ce2b3ef844bad7cac2803a90634
+LIBCONFIG		:= libconfig-$(LIBCONFIG_VERSION)
+LIBCONFIG_SUFFIX	:= tar.gz
+LIBCONFIG_URL		:= http://www.hyperrealm.com/libconfig/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
+LIBCONFIG_SOURCE	:= $(SRCDIR)/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
+LIBCONFIG_DIR		:= $(BUILDDIR)/$(LIBCONFIG)
+LIBCONFIG_LICENSE	:= LGPL
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+LIBCONFIG_CONF_TOOL	:= autoconf
+
+LIBCONFIG_CONF_OPT := \
+	$(CROSS_AUTOCONF_USR) \
+	--disable-examples
+	
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libconfig.targetinstall: $(libconfig_targetinstall_deps_default)
+	@$(call targetinfo, $@)
+
+	@$(call install_init, libconfig)
+	@$(call install_fixup, libconfig,PRIORITY,optional)
+	@$(call install_fixup, libconfig,SECTION,base)
+	@$(call install_fixup, libconfig,AUTHOR,"Guillaume Gourat <guillaume.gourat@nexvision.fr>")
+	@$(call install_fixup, libconfig,DESCRIPTION,missing)
+
+ifdef PTXCONF_LIBCONFIG_INSTALL_LIBCONFIG_SO
+	@$(call install_lib, libconfig, 0, 0, 0644, libconfig)
+endif
+
+ifdef PTXCONF_LIBCONFIG_INSTALL_LIBCONFIGPP_SO
+	@$(call install_lib, libconfig, 0, 0, 0644, libconfig++)
+endif
+
+	@$(call install_finish, libconfig)
+
+	@$(call touch, $@)
+
+# vim: syntax=make
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 2/6] libevent: version bump 2.0.10 -> 2.0.21
  2014-07-21  9:52 [ptxdist] [PATCH 1/6] libconfig: new package Guillaume Gourat
@ 2014-07-21  9:52 ` Guillaume Gourat
  2014-07-21  9:52 ` [ptxdist] [PATCH 3/6] gflags: add new package Guillaume Gourat
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 9+ messages in thread
From: Guillaume Gourat @ 2014-07-21  9:52 UTC (permalink / raw)
  To: ptxdist; +Cc: Guillaume GOURAT

From: Guillaume GOURAT <guillaume.gourat@nexvision.fr>


Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
---
 rules/libevent.make |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/libevent.make b/rules/libevent.make
index 8f252fc..fb6fccd 100644
--- a/rules/libevent.make
+++ b/rules/libevent.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_LIBEVENT) += libevent
 #
 # Paths and names
 #
-LIBEVENT_VERSION	:= 2.0.10
-LIBEVENT_MD5		:= a37401d26cbbf28185211d582741a3d4
+LIBEVENT_VERSION	:= 2.0.21
+LIBEVENT_MD5		:= b2405cc9ebf264aa47ff615d9de527a2
 LIBEVENT		:= libevent-$(LIBEVENT_VERSION)-stable
 LIBEVENT_SUFFIX		:= tar.gz
-LIBEVENT_URL		:= http://www.monkey.org/~provos/$(LIBEVENT).$(LIBEVENT_SUFFIX)
+LIBEVENT_URL		:= https://github.com/downloads/libevent/libevent/$(LIBEVENT).$(LIBEVENT_SUFFIX)
 LIBEVENT_SOURCE		:= $(SRCDIR)/$(LIBEVENT).$(LIBEVENT_SUFFIX)
 LIBEVENT_DIR		:= $(BUILDDIR)/$(LIBEVENT)
 
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 3/6] gflags: add new package
  2014-07-21  9:52 [ptxdist] [PATCH 1/6] libconfig: new package Guillaume Gourat
  2014-07-21  9:52 ` [ptxdist] [PATCH 2/6] libevent: version bump 2.0.10 -> 2.0.21 Guillaume Gourat
@ 2014-07-21  9:52 ` Guillaume Gourat
  2014-07-21  9:53 ` [ptxdist] [PATCH 4/6] glog: " Guillaume Gourat
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 9+ messages in thread
From: Guillaume Gourat @ 2014-07-21  9:52 UTC (permalink / raw)
  To: ptxdist; +Cc: Guillaume GOURAT

From: Guillaume GOURAT <guillaume.gourat@nexvision.fr>


Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
---
 rules/gflags.in   |   16 ++++++++++++++++
 rules/gflags.make |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)
 create mode 100755 rules/gflags.in
 create mode 100755 rules/gflags.make

diff --git a/rules/gflags.in b/rules/gflags.in
new file mode 100755
index 0000000..fc6c199
--- /dev/null
+++ b/rules/gflags.in
@@ -0,0 +1,16 @@
+## SECTION=system_libraries
+
+config GFLAGS
+	tristate
+	prompt "gflags"
+	select LIBC_M
+	select LIBC_PTHREAD
+	select GCCLIBS_GCC_S
+	select GCCLIBS_CXX
+	help
+	  The gflags library implements commandline flags processing. As such it's
+	  a replacement for getopt(). It has increased flexibility, including
+	  built-in support for C++ types like string, and the ability to define
+	  flags in the source file in which they're used.
+	  
+	  See https://code.google.com/p/gflags/ for info about it.
diff --git a/rules/gflags.make b/rules/gflags.make
new file mode 100755
index 0000000..c01910e
--- /dev/null
+++ b/rules/gflags.make
@@ -0,0 +1,53 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Guillaume Gourat <guillaume.gourat@nexvision.fr>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_GFLAGS) += gflags
+
+#
+# Paths and names
+#
+GFLAGS_VERSION	:= 2.0
+GFLAGS_MD5 := 9084829124e02a7e6be0f0f824523423
+GFLAGS		:= gflags-$(GFLAGS_VERSION)
+GFLAGS_SUFFIX	:= tar.gz
+GFLAGS_URL		:= http://gflags.googlecode.com/files/$(GFLAGS)-no-svn-files.$(GFLAGS_SUFFIX)
+GFLAGS_SOURCE	:= $(SRCDIR)/$(GFLAGS)-no-svn-files.$(GFLAGS_SUFFIX)
+GFLAGS_DIR		:= $(BUILDDIR)/$(GFLAGS)
+GFLAGS_LICENSE	:= BSD New
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+GFLAGS_CONF_TOOL	:= autoconf
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/gflags.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, gflags)
+	@$(call install_fixup, gflags,PRIORITY,optional)
+	@$(call install_fixup, gflags,SECTION,base)
+	@$(call install_fixup, gflags,AUTHOR,"Guillaume Gourat <guillaume.gourat@nexvision.fr>")
+	@$(call install_fixup, gflags,DESCRIPTION,missing)
+
+	@$(call install_lib, gflags, 0, 0, 0644, libgflags)
+
+	@$(call install_finish, gflags)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 4/6] glog: add new package
  2014-07-21  9:52 [ptxdist] [PATCH 1/6] libconfig: new package Guillaume Gourat
  2014-07-21  9:52 ` [ptxdist] [PATCH 2/6] libevent: version bump 2.0.10 -> 2.0.21 Guillaume Gourat
  2014-07-21  9:52 ` [ptxdist] [PATCH 3/6] gflags: add new package Guillaume Gourat
@ 2014-07-21  9:53 ` Guillaume Gourat
  2014-09-01 10:31   ` Michael Olbrich
  2014-07-21  9:53 ` [ptxdist] [PATCH 5/6] libhiredis: " Guillaume Gourat
                   ` (2 subsequent siblings)
  5 siblings, 1 reply; 9+ messages in thread
From: Guillaume Gourat @ 2014-07-21  9:53 UTC (permalink / raw)
  To: ptxdist; +Cc: Guillaume GOURAT

From: Guillaume GOURAT <guillaume.gourat@nexvision.fr>


Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
---
 rules/glog.in   |   24 ++++++++++++++++++++++++
 rules/glog.make |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100755 rules/glog.in
 create mode 100755 rules/glog.make

diff --git a/rules/glog.in b/rules/glog.in
new file mode 100755
index 0000000..9fecc9c
--- /dev/null
+++ b/rules/glog.in
@@ -0,0 +1,24 @@
+## SECTION=system_libraries
+
+menuconfig GLOG
+	tristate
+	prompt "glog                          "
+	select LIBC_M
+	select LIBC_PTHREAD
+	select GCCLIBS_GCC_S
+	select GCCLIBS_CXX
+	select GFLAGS if GLOG_USE_GFLAGS
+	help
+	  The glog library implements application-level logging. This library 
+	  provides logging APIs based on C++-style streams and various helper 
+	  macros.
+	  
+	  See https://code.google.com/p/google-glog/ for info about it.
+
+if GLOG
+
+config GLOG_USE_GFLAGS
+	bool
+	prompt "commandline flags processing using gflags"
+
+endif
diff --git a/rules/glog.make b/rules/glog.make
new file mode 100755
index 0000000..522153a
--- /dev/null
+++ b/rules/glog.make
@@ -0,0 +1,54 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Guillaume GOURAT <guillaume.gourat@nexvision.fr>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_GLOG) += glog
+
+#
+# Paths and names
+#
+GLOG_VERSION	:= 0.3.3
+GLOG_MD5 	:= a6fd2c22f8996846e34c763422717c18
+GLOG		:= glog-$(GLOG_VERSION)
+GLOG_SUFFIX	:= tar.gz
+GLOG_URL	:= http://google-glog.googlecode.com/files/$(GLOG).$(GLOG_SUFFIX)
+GLOG_SOURCE	:= $(SRCDIR)/$(GLOG).$(GLOG_SUFFIX)
+GLOG_DIR		:= $(BUILDDIR)/$(GLOG)
+GLOG_LICENSE	:= BSD New
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+GLOG_CONF_TOOL	:= autoconf
+GLOG_ENV 	:= $(CROSS_ENV) LIBS='-lgcc'
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/glog.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, glog)
+	@$(call install_fixup, glog,PRIORITY,optional)
+	@$(call install_fixup, glog,SECTION,base)
+	@$(call install_fixup, glog,AUTHOR,"Guillaume GOURAT <guillaume.gourat@nexvision.fr>")
+	@$(call install_fixup, glog,DESCRIPTION,missing)
+
+	@$(call install_lib, glog, 0, 0, 0644, libglog)
+
+	@$(call install_finish, glog)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [PATCH 4/6] glog: add new package
  2014-07-21  9:53 ` [ptxdist] [PATCH 4/6] glog: " Guillaume Gourat
@ 2014-09-01 10:31   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2014-09-01 10:31 UTC (permalink / raw)
  To: ptxdist

On Mon, Jul 21, 2014 at 11:53:00AM +0200, Guillaume Gourat wrote:
> From: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
> 
> 
> Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
> ---
>  rules/glog.in   |   24 ++++++++++++++++++++++++
>  rules/glog.make |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 78 insertions(+)
>  create mode 100755 rules/glog.in
>  create mode 100755 rules/glog.make
> 
> diff --git a/rules/glog.in b/rules/glog.in
> new file mode 100755
> index 0000000..9fecc9c
> --- /dev/null
> +++ b/rules/glog.in
> @@ -0,0 +1,24 @@
> +## SECTION=system_libraries
> +
> +menuconfig GLOG
> +	tristate
> +	prompt "glog                          "
> +	select LIBC_M
> +	select LIBC_PTHREAD
> +	select GCCLIBS_GCC_S
> +	select GCCLIBS_CXX
> +	select GFLAGS if GLOG_USE_GFLAGS
> +	help
> +	  The glog library implements application-level logging. This library 
> +	  provides logging APIs based on C++-style streams and various helper 
> +	  macros.
> +	  
> +	  See https://code.google.com/p/google-glog/ for info about it.
> +
> +if GLOG
> +
> +config GLOG_USE_GFLAGS
> +	bool
> +	prompt "commandline flags processing using gflags"
> +
> +endif
> diff --git a/rules/glog.make b/rules/glog.make
> new file mode 100755
> index 0000000..522153a
> --- /dev/null
> +++ b/rules/glog.make
> @@ -0,0 +1,54 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 by Guillaume GOURAT <guillaume.gourat@nexvision.fr>
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_GLOG) += glog
> +
> +#
> +# Paths and names
> +#
> +GLOG_VERSION	:= 0.3.3
> +GLOG_MD5 	:= a6fd2c22f8996846e34c763422717c18
> +GLOG		:= glog-$(GLOG_VERSION)
> +GLOG_SUFFIX	:= tar.gz
> +GLOG_URL	:= http://google-glog.googlecode.com/files/$(GLOG).$(GLOG_SUFFIX)
> +GLOG_SOURCE	:= $(SRCDIR)/$(GLOG).$(GLOG_SUFFIX)
> +GLOG_DIR		:= $(BUILDDIR)/$(GLOG)
> +GLOG_LICENSE	:= BSD New
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +GLOG_CONF_TOOL	:= autoconf
> +GLOG_ENV 	:= $(CROSS_ENV) LIBS='-lgcc'

what's "LIBS='-lgcc'" for?

And gflags must be disabled by force, if not selected. Add this too GLOG_ENV:

ac_cv_lib_gflags_main=$(call ptx/ifdef, PTXCONF_GLOG_USE_GFLAGS,,no)

> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/glog.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, glog)
> +	@$(call install_fixup, glog,PRIORITY,optional)
> +	@$(call install_fixup, glog,SECTION,base)
> +	@$(call install_fixup, glog,AUTHOR,"Guillaume GOURAT <guillaume.gourat@nexvision.fr>")
> +	@$(call install_fixup, glog,DESCRIPTION,missing)
> +
> +	@$(call install_lib, glog, 0, 0, 0644, libglog)
> +
> +	@$(call install_finish, glog)
> +
> +	@$(call touch)
> +
> +# vim: syntax=make
> -- 
> 1.7.10.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 5/6] libhiredis: add new package
  2014-07-21  9:52 [ptxdist] [PATCH 1/6] libconfig: new package Guillaume Gourat
                   ` (2 preceding siblings ...)
  2014-07-21  9:53 ` [ptxdist] [PATCH 4/6] glog: " Guillaume Gourat
@ 2014-07-21  9:53 ` Guillaume Gourat
  2014-09-01 10:49   ` Michael Olbrich
  2014-07-21  9:53 ` [ptxdist] [PATCH 6/6] libhiredis: fix pkgconfig file generation Guillaume Gourat
  2014-09-01 10:25 ` [ptxdist] [PATCH 1/6] libconfig: new package Michael Olbrich
  5 siblings, 1 reply; 9+ messages in thread
From: Guillaume Gourat @ 2014-07-21  9:53 UTC (permalink / raw)
  To: ptxdist; +Cc: Guillaume GOURAT

From: Guillaume GOURAT <guillaume.gourat@nexvision.fr>


Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
---
 .../libhiredis-0.11.0/01_use-proper-destdir.patch  |   17 +++
 patches/libhiredis-0.11.0/03_pkgconfig-cmake.patch |  121 ++++++++++++++++++++
 patches/libhiredis-0.11.0/series                   |    2 +
 rules/libhiredis.in                                |    9 ++
 rules/libhiredis.make                              |   59 ++++++++++
 5 files changed, 208 insertions(+)
 create mode 100644 patches/libhiredis-0.11.0/01_use-proper-destdir.patch
 create mode 100644 patches/libhiredis-0.11.0/03_pkgconfig-cmake.patch
 create mode 100644 patches/libhiredis-0.11.0/series
 create mode 100755 rules/libhiredis.in
 create mode 100755 rules/libhiredis.make

diff --git a/patches/libhiredis-0.11.0/01_use-proper-destdir.patch b/patches/libhiredis-0.11.0/01_use-proper-destdir.patch
new file mode 100644
index 0000000..d65c6c9
--- /dev/null
+++ b/patches/libhiredis-0.11.0/01_use-proper-destdir.patch
@@ -0,0 +1,17 @@
+Description: Make the Makefile use the $(DESTDIR) variable
+Origin: vendor
+Forwarded: not-needed
+From: Alessandro Ghedini <ghedo@debian.org>
+Last-Update: 2012-08-28
+
+--- a/Makefile
++++ b/Makefile
+@@ -104,7 +104,7 @@
+ 	$(CC) -MM *.c
+ 
+ # Installation related variables and target
+-PREFIX?=/usr/local
++PREFIX?=$(DESTDIR)/usr
+ INCLUDE_PATH?=include/hiredis
+ LIBRARY_PATH?=lib
+ INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
diff --git a/patches/libhiredis-0.11.0/03_pkgconfig-cmake.patch b/patches/libhiredis-0.11.0/03_pkgconfig-cmake.patch
new file mode 100644
index 0000000..20b036e
--- /dev/null
+++ b/patches/libhiredis-0.11.0/03_pkgconfig-cmake.patch
@@ -0,0 +1,121 @@
+Description: Add pkg-config and cmake scripts
+Origin: vendor
+Forwarded: https://github.com/redis/hiredis/pull/129
+Author: Tom Lee <debian@tomlee.co>
+Last-Update: 2012-11-06
+
+--- /dev/null
++++ b/FindHiredis.cmake
+@@ -0,0 +1,34 @@
++# FindHiredis.cmake - Try to find the Hiredis library
++# Once done this will define
++#
++#  HIREDIS_FOUND - System has Hiredis
++#  HIREDIS_INCLUDE_DIR - The Hiredis include directory
++#  HIREDIS_LIBRARIES - The libraries needed to use Hiredis
++#  HIREDIS_DEFINITIONS - Compiler switches required for using Hiredis
++
++
++# use pkg-config to get the directories and then use these values
++# in the FIND_PATH() and FIND_RARY() calls
++FIND_PACKAGE(PkgConfig)
++PKG_SEARCH_MODULE(PC_HIREDIS REQUIRED hiredis)
++
++SET(HIREDIS_DEFINITIONS ${PC_HIREDIS_CFLAGS_OTHER})
++
++FIND_PATH(HIREDIS_INCLUDE_DIR NAMES hiredis/hiredis.h
++   HINTS
++   ${PC_HIREDIS_INCLUDEDIR}
++   ${PC_HIREDIS_INCLUDE_DIRS}
++   PATH_SUFFIXES hiredis
++   )
++
++FIND_LIBRARY(HIREDIS_LIBRARIES NAMES hiredis
++   HINTS
++   ${PC_HIREDIS_DIR}
++   ${PC_HIREDIS_LIBRARY_DIRS}
++   )
++
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(Hiredis DEFAULT_MSG HIREDIS_LIBRARIES HIREDIS_INCLUDE_DIR)
++
++MARK_AS_ADVANCED(HIREDIS_INCLUDE_DIR HIREDIS_LIBRARIES)
+--- a/Makefile
++++ b/Makefile
+@@ -98,17 +98,25 @@
+ 	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
+ 
+ clean:
+-	rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) hiredis-example* *.o *.gcda *.gcno *.gcov
++	rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) hiredis-example* *.o *.gcda *.gcno *.gcov hiredis.pc
+ 
+ dep:
+ 	$(CC) -MM *.c
+ 
+ # Installation related variables and target
+-PREFIX?=$(DESTDIR)/usr
++SED?=sed
++INSTALL_PREFIX?=$(DESTDIR)/usr
++PREFIX?=$(INSTALL_PREFIX)
+ INCLUDE_PATH?=include/hiredis
+ LIBRARY_PATH?=lib
+-INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
+-INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH)
++LIB_PREFIX?=$(PREFIX)/$(LIBRARY_PATH)
++PKGCONFIG_PATH?=$(LIBRARY_PATH)/pkgconfig
++CMAKE_MODULES_PATH?=share/cmake/Modules
++INSTALL_INCLUDE_PATH= $(INSTALL_PREFIX)/$(INCLUDE_PATH)
++INSTALL_LIBRARY_PATH= $(INSTALL_PREFIX)/$(LIBRARY_PATH)
++INSTALL_PKGCONFIG_PATH= $(INSTALL_PREFIX)/$(PKGCONFIG_PATH)
++INSTALL_CMAKE_MODULES_PATH= $(INSTALL_PREFIX)/$(CMAKE_MODULES_PATH)
++PKG_CONFIG_CFLAGS?= -D_FILE_OFFSET_BITS=64
+ 
+ ifeq ($(uname_S),SunOS)
+   INSTALL?= cp -r
+@@ -116,13 +124,24 @@
+ 
+ INSTALL?= cp -a
+ 
+-install: $(DYLIBNAME) $(STLIBNAME)
++hiredis.pc: hiredis.pc.in
++	test -d $(INSTALL_PKGCONFIG_PATH) && \
++		$(SED) -e 's,@PREFIX@,$(PREFIX),g' \
++				-e 's,@LIB_PREFIX@,$(LIB_PREFIX),g' \
++				-e 's,@CFLAGS@,$(PKG_CONFIG_CFLAGS),g' $< >$@ || true
++
++install: $(DYLIBNAME) $(STLIBNAME) hiredis.pc
+ 	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
+ 	$(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_PATH)
+ 	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
+ 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
+ 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
+ 	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
++	test -f hiredis.pc && \
++	test -d $(INSTALL_PKGCONFIG_PATH) && \
++		$(INSTALL) hiredis.pc $(INSTALL_PKGCONFIG_PATH) && \
++	test -d "$(INSTALL_CMAKE_MODULES_PATH)" && \
++		$(INSTALL) FindHiredis.cmake $(INSTALL_CMAKE_MODULES_PATH) || true
+ 
+ 32bit:
+ 	@echo ""
+@@ -145,4 +164,4 @@
+ noopt:
+ 	$(MAKE) OPTIMIZATION=""
+ 
+-.PHONY: all test check clean dep install 32bit gprof gcov noopt
++.PHONY: all test check clean dep install 32bit gprof gcov noopt hiredis.pc
+--- /dev/null
++++ b/hiredis.pc.in
+@@ -0,0 +1,11 @@
++prefix=@PREFIX@
++exec_prefix=${prefix}
++libdir=@LIB_PREFIX@
++includedir=${prefix}/include
++
++Name: Hiredis
++Description: Minimalistic C client library for the Redis database.
++Version: 0.11.0
++Libs: -L${libdir} -lhiredis
++Cflags: -I${includedir}/hiredis @CFLAGS@
++
diff --git a/patches/libhiredis-0.11.0/series b/patches/libhiredis-0.11.0/series
new file mode 100644
index 0000000..dd8f003
--- /dev/null
+++ b/patches/libhiredis-0.11.0/series
@@ -0,0 +1,2 @@
+01_use-proper-destdir.patch
+03_pkgconfig-cmake.patch
diff --git a/rules/libhiredis.in b/rules/libhiredis.in
new file mode 100755
index 0000000..3109d38
--- /dev/null
+++ b/rules/libhiredis.in
@@ -0,0 +1,9 @@
+## SECTION=system_libraries
+
+config LIBHIREDIS
+	tristate
+	prompt "libhiredis"
+	select GCCLIBS_GCC_S
+	select LIBEVENT
+	help
+	  Hiredis is a minimalistic C client library for the Redis database.
diff --git a/rules/libhiredis.make b/rules/libhiredis.make
new file mode 100755
index 0000000..e7dc992
--- /dev/null
+++ b/rules/libhiredis.make
@@ -0,0 +1,59 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Guillaume Gourat <guillaume.gourat@nexvision.fr> 
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBHIREDIS) += libhiredis
+
+#
+# Paths and names
+#
+LIBHIREDIS_VERSION	:= 0.11.0
+LIBHIREDIS_MD5	:= e2ac29509823ccc96990b6fe765b5d46
+LIBHIREDIS		:= libhiredis-$(LIBHIREDIS_VERSION)
+LIBHIREDIS_SUFFIX	:= tar.gz
+LIBHIREDIS_URL		:= https://github.com/redis/hiredis/archive/v$(LIBHIREDIS_VERSION).$(LIBHIREDIS_SUFFIX)
+LIBHIREDIS_SOURCE	:= $(SRCDIR)/$(LIBHIREDIS).$(LIBHIREDIS_SUFFIX)
+LIBHIREDIS_DIR		:= $(BUILDDIR)/$(LIBHIREDIS)
+LIBHIREDIS_LICENSE	:= BSD
+
+# ----------------------------------------------------------------------------
+# Prepare
+# ----------------------------------------------------------------------------
+
+LIBHIREDIS_CONF_TOOL := NO
+LIBHIREDIS_MAKE_ENV := $(CROSS_ENV)
+LIBHIREDIS_MAKE_PAR := NO
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+$(STATEDIR)/libhiredis.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, libhiredis)
+	@$(call install_fixup, libhiredis,PRIORITY,optional)
+	@$(call install_fixup, libhiredis,SECTION,base)
+	@$(call install_fixup, libhiredis,AUTHOR,"Guillaume Gourat <guillaume.gourat@nexvision.fr>")
+	@$(call install_fixup, libhiredis,DESCRIPTION,missing)
+
+	@$(call install_lib, libhiredis, 0, 0, 0644, libhiredis)
+
+	@$(call install_finish, libhiredis)
+
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Clean
+# ----------------------------------------------------------------------------
+
+# vim: syntax=make
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [PATCH 5/6] libhiredis: add new package
  2014-07-21  9:53 ` [ptxdist] [PATCH 5/6] libhiredis: " Guillaume Gourat
@ 2014-09-01 10:49   ` Michael Olbrich
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2014-09-01 10:49 UTC (permalink / raw)
  To: ptxdist

On Mon, Jul 21, 2014 at 11:53:01AM +0200, Guillaume Gourat wrote:
> From: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
> 

Please address my comments for the last version.

Michael

> Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
> ---
>  .../libhiredis-0.11.0/01_use-proper-destdir.patch  |   17 +++
>  patches/libhiredis-0.11.0/03_pkgconfig-cmake.patch |  121 ++++++++++++++++++++
>  patches/libhiredis-0.11.0/series                   |    2 +
>  rules/libhiredis.in                                |    9 ++
>  rules/libhiredis.make                              |   59 ++++++++++
>  5 files changed, 208 insertions(+)
>  create mode 100644 patches/libhiredis-0.11.0/01_use-proper-destdir.patch
>  create mode 100644 patches/libhiredis-0.11.0/03_pkgconfig-cmake.patch
>  create mode 100644 patches/libhiredis-0.11.0/series
>  create mode 100755 rules/libhiredis.in
>  create mode 100755 rules/libhiredis.make
> 
> diff --git a/patches/libhiredis-0.11.0/01_use-proper-destdir.patch b/patches/libhiredis-0.11.0/01_use-proper-destdir.patch
> new file mode 100644
> index 0000000..d65c6c9
> --- /dev/null
> +++ b/patches/libhiredis-0.11.0/01_use-proper-destdir.patch
> @@ -0,0 +1,17 @@
> +Description: Make the Makefile use the $(DESTDIR) variable
> +Origin: vendor
> +Forwarded: not-needed
> +From: Alessandro Ghedini <ghedo@debian.org>
> +Last-Update: 2012-08-28
> +
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -104,7 +104,7 @@
> + 	$(CC) -MM *.c
> + 
> + # Installation related variables and target
> +-PREFIX?=/usr/local
> ++PREFIX?=$(DESTDIR)/usr
> + INCLUDE_PATH?=include/hiredis
> + LIBRARY_PATH?=lib
> + INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
> diff --git a/patches/libhiredis-0.11.0/03_pkgconfig-cmake.patch b/patches/libhiredis-0.11.0/03_pkgconfig-cmake.patch
> new file mode 100644
> index 0000000..20b036e
> --- /dev/null
> +++ b/patches/libhiredis-0.11.0/03_pkgconfig-cmake.patch
> @@ -0,0 +1,121 @@
> +Description: Add pkg-config and cmake scripts
> +Origin: vendor
> +Forwarded: https://github.com/redis/hiredis/pull/129
> +Author: Tom Lee <debian@tomlee.co>
> +Last-Update: 2012-11-06
> +
> +--- /dev/null
> ++++ b/FindHiredis.cmake
> +@@ -0,0 +1,34 @@
> ++# FindHiredis.cmake - Try to find the Hiredis library
> ++# Once done this will define
> ++#
> ++#  HIREDIS_FOUND - System has Hiredis
> ++#  HIREDIS_INCLUDE_DIR - The Hiredis include directory
> ++#  HIREDIS_LIBRARIES - The libraries needed to use Hiredis
> ++#  HIREDIS_DEFINITIONS - Compiler switches required for using Hiredis
> ++
> ++
> ++# use pkg-config to get the directories and then use these values
> ++# in the FIND_PATH() and FIND_RARY() calls
> ++FIND_PACKAGE(PkgConfig)
> ++PKG_SEARCH_MODULE(PC_HIREDIS REQUIRED hiredis)
> ++
> ++SET(HIREDIS_DEFINITIONS ${PC_HIREDIS_CFLAGS_OTHER})
> ++
> ++FIND_PATH(HIREDIS_INCLUDE_DIR NAMES hiredis/hiredis.h
> ++   HINTS
> ++   ${PC_HIREDIS_INCLUDEDIR}
> ++   ${PC_HIREDIS_INCLUDE_DIRS}
> ++   PATH_SUFFIXES hiredis
> ++   )
> ++
> ++FIND_LIBRARY(HIREDIS_LIBRARIES NAMES hiredis
> ++   HINTS
> ++   ${PC_HIREDIS_DIR}
> ++   ${PC_HIREDIS_LIBRARY_DIRS}
> ++   )
> ++
> ++
> ++INCLUDE(FindPackageHandleStandardArgs)
> ++FIND_PACKAGE_HANDLE_STANDARD_ARGS(Hiredis DEFAULT_MSG HIREDIS_LIBRARIES HIREDIS_INCLUDE_DIR)
> ++
> ++MARK_AS_ADVANCED(HIREDIS_INCLUDE_DIR HIREDIS_LIBRARIES)
> +--- a/Makefile
> ++++ b/Makefile
> +@@ -98,17 +98,25 @@
> + 	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
> + 
> + clean:
> +-	rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) hiredis-example* *.o *.gcda *.gcno *.gcov
> ++	rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) hiredis-example* *.o *.gcda *.gcno *.gcov hiredis.pc
> + 
> + dep:
> + 	$(CC) -MM *.c
> + 
> + # Installation related variables and target
> +-PREFIX?=$(DESTDIR)/usr
> ++SED?=sed
> ++INSTALL_PREFIX?=$(DESTDIR)/usr
> ++PREFIX?=$(INSTALL_PREFIX)
> + INCLUDE_PATH?=include/hiredis
> + LIBRARY_PATH?=lib
> +-INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
> +-INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH)
> ++LIB_PREFIX?=$(PREFIX)/$(LIBRARY_PATH)
> ++PKGCONFIG_PATH?=$(LIBRARY_PATH)/pkgconfig
> ++CMAKE_MODULES_PATH?=share/cmake/Modules
> ++INSTALL_INCLUDE_PATH= $(INSTALL_PREFIX)/$(INCLUDE_PATH)
> ++INSTALL_LIBRARY_PATH= $(INSTALL_PREFIX)/$(LIBRARY_PATH)
> ++INSTALL_PKGCONFIG_PATH= $(INSTALL_PREFIX)/$(PKGCONFIG_PATH)
> ++INSTALL_CMAKE_MODULES_PATH= $(INSTALL_PREFIX)/$(CMAKE_MODULES_PATH)
> ++PKG_CONFIG_CFLAGS?= -D_FILE_OFFSET_BITS=64
> + 
> + ifeq ($(uname_S),SunOS)
> +   INSTALL?= cp -r
> +@@ -116,13 +124,24 @@
> + 
> + INSTALL?= cp -a
> + 
> +-install: $(DYLIBNAME) $(STLIBNAME)
> ++hiredis.pc: hiredis.pc.in
> ++	test -d $(INSTALL_PKGCONFIG_PATH) && \
> ++		$(SED) -e 's,@PREFIX@,$(PREFIX),g' \
> ++				-e 's,@LIB_PREFIX@,$(LIB_PREFIX),g' \
> ++				-e 's,@CFLAGS@,$(PKG_CONFIG_CFLAGS),g' $< >$@ || true
> ++
> ++install: $(DYLIBNAME) $(STLIBNAME) hiredis.pc
> + 	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
> + 	$(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_PATH)
> + 	$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
> + 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
> + 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
> + 	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
> ++	test -f hiredis.pc && \
> ++	test -d $(INSTALL_PKGCONFIG_PATH) && \
> ++		$(INSTALL) hiredis.pc $(INSTALL_PKGCONFIG_PATH) && \
> ++	test -d "$(INSTALL_CMAKE_MODULES_PATH)" && \
> ++		$(INSTALL) FindHiredis.cmake $(INSTALL_CMAKE_MODULES_PATH) || true
> + 
> + 32bit:
> + 	@echo ""
> +@@ -145,4 +164,4 @@
> + noopt:
> + 	$(MAKE) OPTIMIZATION=""
> + 
> +-.PHONY: all test check clean dep install 32bit gprof gcov noopt
> ++.PHONY: all test check clean dep install 32bit gprof gcov noopt hiredis.pc
> +--- /dev/null
> ++++ b/hiredis.pc.in
> +@@ -0,0 +1,11 @@
> ++prefix=@PREFIX@
> ++exec_prefix=${prefix}
> ++libdir=@LIB_PREFIX@
> ++includedir=${prefix}/include
> ++
> ++Name: Hiredis
> ++Description: Minimalistic C client library for the Redis database.
> ++Version: 0.11.0
> ++Libs: -L${libdir} -lhiredis
> ++Cflags: -I${includedir}/hiredis @CFLAGS@
> ++
> diff --git a/patches/libhiredis-0.11.0/series b/patches/libhiredis-0.11.0/series
> new file mode 100644
> index 0000000..dd8f003
> --- /dev/null
> +++ b/patches/libhiredis-0.11.0/series
> @@ -0,0 +1,2 @@
> +01_use-proper-destdir.patch
> +03_pkgconfig-cmake.patch
> diff --git a/rules/libhiredis.in b/rules/libhiredis.in
> new file mode 100755
> index 0000000..3109d38
> --- /dev/null
> +++ b/rules/libhiredis.in
> @@ -0,0 +1,9 @@
> +## SECTION=system_libraries
> +
> +config LIBHIREDIS
> +	tristate
> +	prompt "libhiredis"
> +	select GCCLIBS_GCC_S
> +	select LIBEVENT
> +	help
> +	  Hiredis is a minimalistic C client library for the Redis database.
> diff --git a/rules/libhiredis.make b/rules/libhiredis.make
> new file mode 100755
> index 0000000..e7dc992
> --- /dev/null
> +++ b/rules/libhiredis.make
> @@ -0,0 +1,59 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 by Guillaume Gourat <guillaume.gourat@nexvision.fr> 
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_LIBHIREDIS) += libhiredis
> +
> +#
> +# Paths and names
> +#
> +LIBHIREDIS_VERSION	:= 0.11.0
> +LIBHIREDIS_MD5	:= e2ac29509823ccc96990b6fe765b5d46
> +LIBHIREDIS		:= libhiredis-$(LIBHIREDIS_VERSION)
> +LIBHIREDIS_SUFFIX	:= tar.gz
> +LIBHIREDIS_URL		:= https://github.com/redis/hiredis/archive/v$(LIBHIREDIS_VERSION).$(LIBHIREDIS_SUFFIX)
> +LIBHIREDIS_SOURCE	:= $(SRCDIR)/$(LIBHIREDIS).$(LIBHIREDIS_SUFFIX)
> +LIBHIREDIS_DIR		:= $(BUILDDIR)/$(LIBHIREDIS)
> +LIBHIREDIS_LICENSE	:= BSD
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +LIBHIREDIS_CONF_TOOL := NO
> +LIBHIREDIS_MAKE_ENV := $(CROSS_ENV)
> +LIBHIREDIS_MAKE_PAR := NO
> +
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/libhiredis.targetinstall:
> +	@$(call targetinfo)
> +
> +	@$(call install_init, libhiredis)
> +	@$(call install_fixup, libhiredis,PRIORITY,optional)
> +	@$(call install_fixup, libhiredis,SECTION,base)
> +	@$(call install_fixup, libhiredis,AUTHOR,"Guillaume Gourat <guillaume.gourat@nexvision.fr>")
> +	@$(call install_fixup, libhiredis,DESCRIPTION,missing)
> +
> +	@$(call install_lib, libhiredis, 0, 0, 0644, libhiredis)
> +
> +	@$(call install_finish, libhiredis)
> +
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Clean
> +# ----------------------------------------------------------------------------
> +
> +# vim: syntax=make
> -- 
> 1.7.10.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [ptxdist] [PATCH 6/6] libhiredis: fix pkgconfig file generation
  2014-07-21  9:52 [ptxdist] [PATCH 1/6] libconfig: new package Guillaume Gourat
                   ` (3 preceding siblings ...)
  2014-07-21  9:53 ` [ptxdist] [PATCH 5/6] libhiredis: " Guillaume Gourat
@ 2014-07-21  9:53 ` Guillaume Gourat
  2014-09-01 10:25 ` [ptxdist] [PATCH 1/6] libconfig: new package Michael Olbrich
  5 siblings, 0 replies; 9+ messages in thread
From: Guillaume Gourat @ 2014-07-21  9:53 UTC (permalink / raw)
  To: ptxdist; +Cc: Guillaume GOURAT

From: Guillaume GOURAT <guillaume.gourat@nexvision.fr>


Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
---
 .../04_pkgconfig-cmake-mkdir.patch                 |   26 ++++++++++++++++++++
 patches/libhiredis-0.11.0/series                   |    1 +
 2 files changed, 27 insertions(+)
 create mode 100644 patches/libhiredis-0.11.0/04_pkgconfig-cmake-mkdir.patch

diff --git a/patches/libhiredis-0.11.0/04_pkgconfig-cmake-mkdir.patch b/patches/libhiredis-0.11.0/04_pkgconfig-cmake-mkdir.patch
new file mode 100644
index 0000000..6263755
--- /dev/null
+++ b/patches/libhiredis-0.11.0/04_pkgconfig-cmake-mkdir.patch
@@ -0,0 +1,26 @@
+Index: libhiredis-0.11.0/Makefile
+===================================================================
+--- libhiredis-0.11.0.orig/Makefile	2014-07-20 16:07:04.146360911 +0200
++++ libhiredis-0.11.0/Makefile	2014-07-20 16:25:17.036624864 +0200
+@@ -125,10 +125,9 @@
+ INSTALL?= cp -a
+ 
+ hiredis.pc: hiredis.pc.in
+-	test -d $(INSTALL_PKGCONFIG_PATH) && \
+-		$(SED) -e 's,@PREFIX@,$(PREFIX),g' \
+-				-e 's,@LIB_PREFIX@,$(LIB_PREFIX),g' \
+-				-e 's,@CFLAGS@,$(PKG_CONFIG_CFLAGS),g' $< >$@ || true
++	$(SED) -e 's,@PREFIX@,$(PREFIX),g' \
++		-e 's,@LIB_PREFIX@,$(LIB_PREFIX),g' \
++		-e 's,@CFLAGS@,$(PKG_CONFIG_CFLAGS),g' $< >$@ || true
+ 
+ install: $(DYLIBNAME) $(STLIBNAME) hiredis.pc
+ 	mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
+@@ -137,6 +136,7 @@
+ 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
+ 	cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
+ 	$(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
++	mkdir -p  $(INSTALL_PKGCONFIG_PATH) $(INSTALL_CMAKE_MODULES_PATH)
+ 	test -f hiredis.pc && \
+ 	test -d $(INSTALL_PKGCONFIG_PATH) && \
+ 		$(INSTALL) hiredis.pc $(INSTALL_PKGCONFIG_PATH) && \
diff --git a/patches/libhiredis-0.11.0/series b/patches/libhiredis-0.11.0/series
index dd8f003..87dd71a 100644
--- a/patches/libhiredis-0.11.0/series
+++ b/patches/libhiredis-0.11.0/series
@@ -1,2 +1,3 @@
 01_use-proper-destdir.patch
 03_pkgconfig-cmake.patch
+04_pkgconfig-cmake-mkdir.patch
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [ptxdist] [PATCH 1/6] libconfig: new package
  2014-07-21  9:52 [ptxdist] [PATCH 1/6] libconfig: new package Guillaume Gourat
                   ` (4 preceding siblings ...)
  2014-07-21  9:53 ` [ptxdist] [PATCH 6/6] libhiredis: fix pkgconfig file generation Guillaume Gourat
@ 2014-09-01 10:25 ` Michael Olbrich
  5 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2014-09-01 10:25 UTC (permalink / raw)
  To: ptxdist

On Mon, Jul 21, 2014 at 11:52:57AM +0200, Guillaume Gourat wrote:
> From: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
> 

Please address the comments I made for the last version.

Michael

> Signed-off-by: Guillaume GOURAT <guillaume.gourat@nexvision.fr>
> ---
>  rules/libconfig.in   |   27 ++++++++++++++++++++++
>  rules/libconfig.make |   63 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 90 insertions(+)
>  create mode 100644 rules/libconfig.in
>  create mode 100644 rules/libconfig.make
> 
> diff --git a/rules/libconfig.in b/rules/libconfig.in
> new file mode 100644
> index 0000000..286668a
> --- /dev/null
> +++ b/rules/libconfig.in
> @@ -0,0 +1,27 @@
> +## SECTION=system_libraries
> +
> +menuconfig LIBCONFIG
> +	tristate
> +	prompt "libconfig                     "
> +	select LIBC_M
> +	select GCCLIBS_GCC_S
> +	select GCCLIBS_CXX
> +	help
> +	  Libconfig is a simple library for processing structured configuration
> +	  files. Libconfig is very compact, a fraction of the size of the expat
> +	  XML parser library. This makes it well-suited for memory-constrained
> +	  systems like handheld devices.
> +
> +          See http://www.hyperrealm.com/libconfig/ for info about it.
> +
> +if LIBCONFIG
> + 
> +config LIBCONFIG_INSTALL_LIBCONFIG_SO
> +	bool
> +	prompt "Install libconfig on the target"
> +
> +config LIBCONFIG_INSTALL_LIBCONFIGPP_SO
> +	bool
> +	prompt "Install libconfig++ on the target"
> +
> +endif
> diff --git a/rules/libconfig.make b/rules/libconfig.make
> new file mode 100644
> index 0000000..26919d3
> --- /dev/null
> +++ b/rules/libconfig.make
> @@ -0,0 +1,63 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2014 by Guillaume Gourat <guillaume.gourat@nexvision.fr> 
> +#
> +# See CREDITS for details about who has contributed to this project.
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_LIBCONFIG) += libconfig
> +
> +#
> +# Paths and names
> +#
> +LIBCONFIG_VERSION	:= 1.4.9
> +LIBCONFIG_MD5	:= b6ee0ce2b3ef844bad7cac2803a90634
> +LIBCONFIG		:= libconfig-$(LIBCONFIG_VERSION)
> +LIBCONFIG_SUFFIX	:= tar.gz
> +LIBCONFIG_URL		:= http://www.hyperrealm.com/libconfig/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
> +LIBCONFIG_SOURCE	:= $(SRCDIR)/$(LIBCONFIG).$(LIBCONFIG_SUFFIX)
> +LIBCONFIG_DIR		:= $(BUILDDIR)/$(LIBCONFIG)
> +LIBCONFIG_LICENSE	:= LGPL
> +
> +# ----------------------------------------------------------------------------
> +# Prepare
> +# ----------------------------------------------------------------------------
> +
> +LIBCONFIG_CONF_TOOL	:= autoconf
> +
> +LIBCONFIG_CONF_OPT := \
> +	$(CROSS_AUTOCONF_USR) \
> +	--disable-examples
> +	
> +# ----------------------------------------------------------------------------
> +# Target-Install
> +# ----------------------------------------------------------------------------
> +
> +$(STATEDIR)/libconfig.targetinstall: $(libconfig_targetinstall_deps_default)
> +	@$(call targetinfo, $@)
> +
> +	@$(call install_init, libconfig)
> +	@$(call install_fixup, libconfig,PRIORITY,optional)
> +	@$(call install_fixup, libconfig,SECTION,base)
> +	@$(call install_fixup, libconfig,AUTHOR,"Guillaume Gourat <guillaume.gourat@nexvision.fr>")
> +	@$(call install_fixup, libconfig,DESCRIPTION,missing)
> +
> +ifdef PTXCONF_LIBCONFIG_INSTALL_LIBCONFIG_SO
> +	@$(call install_lib, libconfig, 0, 0, 0644, libconfig)
> +endif
> +
> +ifdef PTXCONF_LIBCONFIG_INSTALL_LIBCONFIGPP_SO
> +	@$(call install_lib, libconfig, 0, 0, 0644, libconfig++)
> +endif
> +
> +	@$(call install_finish, libconfig)
> +
> +	@$(call touch, $@)
> +
> +# vim: syntax=make
> -- 
> 1.7.10.4
> 
> 
> -- 
> ptxdist mailing list
> ptxdist@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2014-09-01 10:49 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-21  9:52 [ptxdist] [PATCH 1/6] libconfig: new package Guillaume Gourat
2014-07-21  9:52 ` [ptxdist] [PATCH 2/6] libevent: version bump 2.0.10 -> 2.0.21 Guillaume Gourat
2014-07-21  9:52 ` [ptxdist] [PATCH 3/6] gflags: add new package Guillaume Gourat
2014-07-21  9:53 ` [ptxdist] [PATCH 4/6] glog: " Guillaume Gourat
2014-09-01 10:31   ` Michael Olbrich
2014-07-21  9:53 ` [ptxdist] [PATCH 5/6] libhiredis: " Guillaume Gourat
2014-09-01 10:49   ` Michael Olbrich
2014-07-21  9:53 ` [ptxdist] [PATCH 6/6] libhiredis: fix pkgconfig file generation Guillaume Gourat
2014-09-01 10:25 ` [ptxdist] [PATCH 1/6] libconfig: new package Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox