Re: [ptxdist] [PATCH v2] nginx: version bump 1.10.3 -> 1.12.1

[Roland Hieber]

Hi,

I'm currently trying to backport this patch onto a BSP based on an older
PTXdist. I'll shorten the context to the relevant parts:

On 03.08.2017 16:49, Clemens Gruber wrote:
> Also update patches from buildroot and replace the missing --with-ipv6
> flag by overriding the feature build test results for IPv6 depending on
> the GLOBAL_IPV6_OPTION in PTXdist.
> 
> Signed-off-by: Clemens Gruber 
> ---
> 
> Changes since v1:
> - Do not depend on build-time autodetection and force IPv6 test result
> - Readd buildroot git-ptx-patches tag after base
> 

[...]

> diff --git 
> a/patches/nginx-1.12.1/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
>  
> b/patches/nginx-1.12.1/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
> new file mode 100644
> index 0..93813beb7
> --- /dev/null
> +++ 
> b/patches/nginx-1.12.1/0101-auto-unix-allow-overriding-the-IPv6-build-test.patch
> @@ -0,0 +1,33 @@
> +From: Clemens Gruber 
> +Date: Thu, 3 Aug 2017 15:47:08 +0200
> +Subject: [PATCH] auto/unix: allow overriding the IPv6 build tests
> +
> +Signed-off-by: Clemens Gruber 
> +---
> + auto/unix | 7 ---
> + 1 file changed, 4 insertions(+), 3 deletions(-)
> +
> +diff --git a/auto/unix b/auto/unix
> +index ed821b5a5aaa..dba1be478b9d 100644
> +--- a/auto/unix
>  b/auto/unix
> +@@ -412,7 +412,8 @@ ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_PKTINFO, 
> NULL, 0)"
> + 
> + ngx_feature="IPV6_RECVPKTINFO"
> + ngx_feature_name="NGX_HAVE_IPV6_RECVPKTINFO"
> +-ngx_feature_run=no
> ++ngx_feature_run_force_result="$ngx_force_ipv6"
> ++ngx_feature_run=value
> + ngx_feature_incs="#include 
> +   #include "
> + ngx_feature_path=
> +@@ -640,7 +640,8 @@ ngx_param=NGX_MAX_TIME_T_VALUE; 
> ngx_value=$ngx_max_value; . auto/types/value
> + 
> + ngx_feature="AF_INET6"
> + ngx_feature_name="NGX_HAVE_INET6"
> +-ngx_feature_run=no
> ++ngx_feature_run_force_result="$ngx_force_ipv6"
> ++ngx_feature_run=value
> + ngx_feature_incs="#include 
> +   #include 
> +   #include "

[...]

> diff --git a/rules/nginx.make b/rules/nginx.make
> index ef98c0adb..0f8ce65f2 100644
> --- a/rules/nginx.make
> +++ b/rules/nginx.make
> @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_NGINX) += nginx
>  #
>  # Paths and names
>  #
> -NGINX_VERSION:= 1.10.3
> -NGINX_MD5:= 204a20cb4f0b0c9db746c630d89ff4ea
> +NGINX_VERSION:= 1.12.1
> +NGINX_MD5:= a307e74aca95403e5ee00f153807ce58
>  NGINX:= nginx-$(NGINX_VERSION)
>  NGINX_SUFFIX := tar.gz
>  NGINX_URL:= https://nginx.org/download/$(NGINX).$(NGINX_SUFFIX)
> @@ -44,7 +44,8 @@ NGINX_CONF_ENV := \
>   ngx_force_have_map_anon=yes \
>   ngx_force_have_map_devzero=yes \
>   ngx_force_have_sysvshm=yes \
> - ngx_force_have_posix_sem=yes
> + ngx_force_have_posix_sem=yes \

I cannot get IPv6 to work, because nginx complains about "the INET6
sockets are not supported on this platform" when I try to have it listen
on [::]:443. This happens because NGX_HAVE_INET6 apparently gets defined
to "yes" in objs/ngx_auto_config.h, and it works well if I change this line:

> + ngx_force_ipv6=$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6, yes, no)

to
ngx_force_ipv6=$(call ptx/ifdef, PTXCONF_GLOBAL_IPV6, 1, 0)

Can you reproduce this?

 - Roland

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

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] lcms: version bump 1.19 -> 2.9

[Robert Schwebel]

On Mon, Nov 20, 2017 at 04:14:11PM +0100, Roland Hieber wrote:
> libcms 1.19 was released 2009, and is no longer maintained, so it is
  lcms, right?

> about time. Python support has been removed. MD5 for the license file
> has changed, but it's still the MIT License. Also make the tools
> installable.
> 
> Signed-off-by: Roland Hieber 
> ---
>  rules/lcms.in   | 13 +++--
>  rules/lcms.make | 20 
>  2 files changed, 23 insertions(+), 10 deletions(-)
> 
> diff --git a/rules/lcms.in b/rules/lcms.in
> index b7bae423b..f03776c59 100644
> --- a/rules/lcms.in
> +++ b/rules/lcms.in
> @@ -1,9 +1,18 @@
>  ## SECTION=system_libraries
>  
> -config LCMS
> +menuconfig LCMS
>   tristate
> - prompt "lcms"
> + prompt "lcms  "
>   select LIBC_M
>   help
> LittleCMS intends to be a small-footprint, speed
> optimized color management engine in open source form.
> +
> +if LCMS
> +
> +config LCMS_BIN
> + bool "install tools"
> + help
> +   Install transicc, psicc, linkicc
> +
> +endif
> diff --git a/rules/lcms.make b/rules/lcms.make
> index 55bb10e6d..7ca10dd7a 100644
> --- a/rules/lcms.make
> +++ b/rules/lcms.make
> @@ -16,15 +16,15 @@ PACKAGES-$(PTXCONF_LCMS) += lcms
>  #
>  # Paths and names
>  #
> -LCMS_VERSION := 1.19
> -LCMS_MD5 := 8af94611baf20d9646c7c2c285859818
> -LCMS := lcms-$(LCMS_VERSION)
> +LCMS_VERSION := 2.9
> +LCMS_MD5 := 45865f3faf3cc1a9778f89e255495331
> +LCMS := lcms2-$(LCMS_VERSION)
>  LCMS_SUFFIX  := tar.gz
>  LCMS_URL := $(call ptx/mirror, SF, lcms/$(LCMS).$(LCMS_SUFFIX))
>  LCMS_SOURCE  := $(SRCDIR)/$(LCMS).$(LCMS_SUFFIX)
> -LCMS_DIR := $(BUILDDIR)/lcms-1.19
> +LCMS_DIR := $(BUILDDIR)/$(LCMS)
>  LCMS_LICENSE := MIT
> -LCMS_LICENSE_FILES   := file://COPYING;md5=156745cad721a8783cb847e82b79f586
> +LCMS_LICENSE_FILES   := file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516
>  
>  # 
> 
>  # Prepare
> @@ -40,8 +40,7 @@ LCMS_AUTOCONF := \
>   $(CROSS_AUTOCONF_USR) \
>   --without-tiff \
>   --without-zlib \
> - --without-jpeg \
> - --without-python
> + --without-jpeg
>  
>  # 
> 
>  # Target-Install
> @@ -56,8 +55,13 @@ $(STATEDIR)/lcms.targetinstall:
>   @$(call install_fixup, lcms,AUTHOR,"Michael Olbrich 
> ")
>   @$(call install_fixup, lcms,DESCRIPTION,missing)
>  
> - @$(call install_lib, lcms, 0, 0, 0644, liblcms)
> + @$(call install_lib, lcms, 0, 0, 0644, liblcms2)
>  
> +ifdef PTXCONF_LCMS_BIN
> + @$(call install_copy, lcms, 0, 0, 0755, -, /usr/bin/transicc)
> + @$(call install_copy, lcms, 0, 0, 0755, -, /usr/bin/psicc)
> + @$(call install_copy, lcms, 0, 0, 0755, -, /usr/bin/linkicc)
> +endif
>   @$(call install_finish, lcms)
>  
>   @$(call touch)
> -- 
> 2.11.0
> 
> 
> ___
> 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- |

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] unsubscribe

[Gertjan.Manenschijn]

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] poppler: version bump 0.60.1 -> 0.61.1

[Roland Hieber]

Patches have gone upstream or are no longer needed because we now link
with libcms2, as libcms1 support will soon be dropped upstream.

Apparently pthread detection in CMake has changed, work around it.

Also include MD5 sums for the license files.

Signed-off-by: Roland Hieber 
---
 ...dd-the-custom-buildtests-target-only-once.patch | 58 --
 ...Make-make-FindLCMS.cmake-cross-compatible.patch | 69 --
 patches/poppler-0.60.1/series  |  5 --
 rules/poppler.in   |  3 +-
 rules/poppler.make | 17 --
 5 files changed, 14 insertions(+), 138 deletions(-)
 delete mode 100644 
patches/poppler-0.60.1/0001-CMake-add-the-custom-buildtests-target-only-once.patch
 delete mode 100644 
patches/poppler-0.60.1/0002-CMake-make-FindLCMS.cmake-cross-compatible.patch
 delete mode 100644 patches/poppler-0.60.1/series

diff --git 
a/patches/poppler-0.60.1/0001-CMake-add-the-custom-buildtests-target-only-once.patch
 
b/patches/poppler-0.60.1/0001-CMake-add-the-custom-buildtests-target-only-once.patch
deleted file mode 100644
index 7d996760a..0
--- 
a/patches/poppler-0.60.1/0001-CMake-add-the-custom-buildtests-target-only-once.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Roland Hieber 
-Date: Mon, 6 Nov 2017 15:36:34 +0100
-Subject: [PATCH] CMake: add the custom `buildtests` target only once
-
-This fixes building with -DBUILD_QT4_TESTS=NO or -DBUILD_QT5_TESTS=NO,
-which resulted in error messages like:
-
-  CMake Error at cmake/modules/PopplerMacros.cmake:41 (add_custom_target):
-add_custom_target cannot create target "buildtests" because another
-target with the same name already exists.  The existing target is a
-custom target created in source directory
-"[...]/poppler-0.60.1/qt4/tests".
-See documentation for policy CMP0002 for more details.
-  Call Stack (most recent call first):
-qt4/tests/CMakeLists.txt:30 (poppler_add_unittest)
-qt4/tests/CMakeLists.txt:52 (qt4_add_qtest)
-
-Solve this by making BUILDTESTS_ADDED a global property so it is only
-remembered once per project instead of per directory.
-
-Fixes bug #103003.
-
-Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=103003#c5
-Signed-off-by: Roland Hieber 

- cmake/modules/PopplerMacros.cmake | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/PopplerMacros.cmake 
b/cmake/modules/PopplerMacros.cmake
-index ba4bceb36ba4..4542751a0857 100644
 a/cmake/modules/PopplerMacros.cmake
-+++ b/cmake/modules/PopplerMacros.cmake
-@@ -13,10 +13,10 @@ macro(POPPLER_ADD_TEST exe build_flag)
- 
-   # if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all 
tests
-   if(NOT build_test AND NOT MSVC_IDE)
--get_directory_property(_buildtestsAdded BUILDTESTS_ADDED)
-+get_property(_buildtestsAdded GLOBAL PROPERTY BUILDTESTS_ADDED)
- if(NOT _buildtestsAdded)
-   add_custom_target(buildtests)
--  set_directory_properties(PROPERTIES BUILDTESTS_ADDED TRUE)
-+  set_property(GLOBAL PROPERTY BUILDTESTS_ADDED TRUE)
- endif(NOT _buildtestsAdded)
- add_dependencies(buildtests ${exe})
-   endif(NOT build_test AND NOT MSVC_IDE)
-@@ -33,10 +33,10 @@ macro(POPPLER_ADD_UNITTEST exe build_flag)
- 
-   # if the tests are EXCLUDE_FROM_ALL, add a target "buildtests" to build all 
tests
-   if(NOT build_test)
--get_directory_property(_buildtestsAdded BUILDTESTS_ADDED)
-+get_property(_buildtestsAdded GLOBAL PROPERTY BUILDTESTS_ADDED)
- if(NOT _buildtestsAdded)
-   add_custom_target(buildtests)
--  set_directory_properties(PROPERTIES BUILDTESTS_ADDED TRUE)
-+  set_property(GLOBAL PROPERTY BUILDTESTS_ADDED TRUE)
- endif(NOT _buildtestsAdded)
- add_dependencies(buildtests ${exe})
-   endif(NOT build_test)
diff --git 
a/patches/poppler-0.60.1/0002-CMake-make-FindLCMS.cmake-cross-compatible.patch 
b/patches/poppler-0.60.1/0002-CMake-make-FindLCMS.cmake-cross-compatible.patch
deleted file mode 100644
index 2e9285c62..0
--- 
a/patches/poppler-0.60.1/0002-CMake-make-FindLCMS.cmake-cross-compatible.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Roland Hieber 
-Date: Mon, 6 Nov 2017 17:31:17 +0100
-Subject: [PATCH] CMake: make FindLCMS.cmake cross-compatible
-
-FindLCMS.make complains when being run in cross-compile mode:
-
-  -- Checking for module 'lcms'
-  --   Found lcms, version 1.19
-  CMake Error: TRY_RUN() invoked in cross-compiling mode, please set the
-  following cache variables appropriately:
- LCMS_VERSION (advanced)
- LCMS_VERSION__TRYRUN_OUTPUT (advanced)
-  For details see [...]/poppler-0.60.1-build/TryRunResults.cmake
-  -- Found lcms version P.LE, [...]/sysroot-target/usr/lib/liblcms.so
-
-To work around this, replace try_run() with the version parsing regex
-from FindLCMS2.make, and adapt it