diff options
author | Karen Arutyunov <karen@codesynthesis.com> | 2019-07-18 16:56:35 +0300 |
---|---|---|
committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-07-20 14:19:18 +0300 |
commit | 1e53fa691949998dfa711878ecb7863814f085ee (patch) | |
tree | 830b85261c13f7702ec4153f852beecabb79b14f /libpkgconf/README-DEV | |
parent | a0cb8991b2cb61e9c0f3d8075759939cc61d57f0 (diff) |
Upgrade to 1.6.3
Diffstat (limited to 'libpkgconf/README-DEV')
-rw-r--r-- | libpkgconf/README-DEV | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/libpkgconf/README-DEV b/libpkgconf/README-DEV index 5188ab1..0a63eb9 100644 --- a/libpkgconf/README-DEV +++ b/libpkgconf/README-DEV @@ -2,34 +2,30 @@ This document describes how libpkgconf was packaged for build2. In particular, this understanding will be useful when upgrading to a new upstream version. See ../README-DEV for general notes on pkgconf packaging. -Symlink the required upstream files and directories and provide our own -implementations for auto-generated headers: +Symlink the required upstream files and provide our own implementation for +auto-generated config.h: $ ln -s ../upstream/{AUTHORS,COPYING} ./ - -$ ln -s ../../upstream/libpkgconf/config.h.cmake.in \ - libpkgconf/config.h.cmake.in.orig - +$ ln -s ../../upstream/libpkgconf/config.h.meson libpkgconf/config.h.meson.orig $ cd libpkgconf && ln -s ../../upstream/libpkgconf/*.{c,h} ./ -Use libpkgconf/config.h.cmake.in.orig for creating libpkgconf/config.h and -libpkgconf/version.h.in, defining/undefining macros introduced with -#cmakedefine. +Use libpkgconf/config.h.meson.orig for creating libpkgconf/config.h.in, +defining/undefining macros introduced with #mesondefine. -Re-creating libpkgconf/config.h from scratch every time we upgrade to a new +Re-creating libpkgconf/config.h.in from scratch every time we upgrade to a new upstream version would be a real pain. Instead we can only (un)define the newly introduced macros, comparing the already defined and currently used macro sets: -$ for m in `cat libpkgconf/config.h.cmake.in.orig | \ - sed -n 's/.*#\s*cmakedefine\s\{1,\}\([_a-zA-Z0-9]\{1,\}\)\(\s.*\)\{0,1\}$/\1/p' | sort -u`; do - if grep -q -e "\b$m\b" `find -L . -name '*.h' -a ! -name config.h -a ! -name version.h -o -name '*.c'`; then +$ for m in `cat libpkgconf/config.h.meson.orig | \ + sed -n 's/.*#\s*mesondefine\s\{1,\}\([_a-zA-Z0-9]\{1,\}\)\(\s.*\)\{0,1\}$/\1/p' | sort -u`; do + if grep -q -e "\b$m\b" `find -L . -name '*.h' -a ! -name config.h -o -name '*.c'`; then echo "$m" fi done >used-macros -$ cat libpkgconf/config.h | +$ cat libpkgconf/config.h.in | sed -n 's/#\s*\(define\|undef\)\s\{1,\}\([_a-zA-Z0-9]\{1,\}\)\(\s.*\)\{0,1\}$/\2/p' | sort -u >defined-macros -$ diff defined-macros used-macros >diff-macros +$ diff defined-macros used-macros |