* [PATCH 1/2] openjade: Fix build if not installing the libtool-garbage @ 2016-01-04 10:23 Ross Burton 2016-01-04 10:23 ` [PATCH 2/2] systemd: add more compression and importd PACKAGECONFIGs Ross Burton 0 siblings, 1 reply; 5+ messages in thread From: Ross Burton @ 2016-01-04 10:23 UTC (permalink / raw) To: openembedded-core; +Cc: Phil Blundell From: Phil Blundell <philb@brightsign.biz> The openjade build system is slightly funky and does strange things with library dependencies. Fix it up so that it depends on the .so rather than the .la (which may not exist) for libraries from the sysroot. Signed-off-by: Ross Burton <ross.burton@intel.com> --- .../openjade/openjade-1.3.2/no-libtool.patch | 20 ++++++++++++++++++++ .../openjade/openjade-native_1.3.2.bb | 1 + 2 files changed, 21 insertions(+) create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch new file mode 100644 index 0000000..8642bfd --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch @@ -0,0 +1,20 @@ +The openjade build is fairly unique in auto-generating explicit dependencies to +installed .la files. As some distributions may delete these files unless +clearly required, change the Makefile fragment to depend on the .so instead. + +Patch originally by Phil Blundell <philb@brightsign.biz>. + +Signed-off-by: Ross Burton <ross.burton@intel.com> +Upstream-Status: Inappropriate + +--- openjade-1.3.2/Makefile.prog.in~ 2013-05-14 11:42:02.646782318 +0100 ++++ openjade-1.3.2/Makefile.prog.in 2013-05-14 11:54:55.051728343 +0100 +@@ -12,7 +12,7 @@ + + ALL_LIBS = $(XLIBS) $(LIBS) + Makefile.lt: +- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt ++ echo 'LT_LIBS='`for d in $(ALL_LIBS); do case $$d in ../*) echo $$d | sed 's/\.a/.la/g' ;; *) echo $$d | sed 's/\.a/.so/g' ;; esac ; done` >Makefile.lt + + PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') + diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb index a304daa..068fdf0 100644 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb @@ -16,6 +16,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ file://makefile.patch \ file://msggen.pl.patch \ file://reautoconf.patch \ + file://no-libtool.patch \ file://user-declared-default-constructor.patch \ file://fix-regex.patch" -- 2.6.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] systemd: add more compression and importd PACKAGECONFIGs 2016-01-04 10:23 [PATCH 1/2] openjade: Fix build if not installing the libtool-garbage Ross Burton @ 2016-01-04 10:23 ` Ross Burton 2016-01-04 18:36 ` Khem Raj 0 siblings, 1 reply; 5+ messages in thread From: Ross Burton @ 2016-01-04 10:23 UTC (permalink / raw) To: openembedded-core Add explicit PACKAGECONFIGs for all of compression formats that systemd can detect at configure time, and an explicit enable/disable for importd. importd defaults to disabled as it needs curl and all the compression formats to be enabled. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-core/systemd/systemd_228.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/systemd/systemd_228.bb b/meta/recipes-core/systemd/systemd_228.bb index 0f95390..6673042 100644 --- a/meta/recipes-core/systemd/systemd_228.bb +++ b/meta/recipes-core/systemd/systemd_228.bb @@ -70,13 +70,13 @@ PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" # regardless of PACKAGECONFIG, libgcrypt is always required to expand # the AM_PATH_LIBGCRYPT autoconf macro DEPENDS += "libgcrypt" -# Compress the journal -PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup" PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd" PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" +# importd requires curl/xz/zlib/bzip2/gcrypt +PACKAGECONFIG[importd] = "--enable-importd,--disable-importd" PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" @@ -92,6 +92,10 @@ PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump" +PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" +PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" +PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" -- 2.6.4 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] systemd: add more compression and importd PACKAGECONFIGs 2016-01-04 10:23 ` [PATCH 2/2] systemd: add more compression and importd PACKAGECONFIGs Ross Burton @ 2016-01-04 18:36 ` Khem Raj 2016-01-04 20:53 ` Burton, Ross 0 siblings, 1 reply; 5+ messages in thread From: Khem Raj @ 2016-01-04 18:36 UTC (permalink / raw) To: Ross Burton; +Cc: Patches and discussions about the oe-core layer On Mon, Jan 4, 2016 at 2:23 AM, Ross Burton <ross.burton@intel.com> wrote: > Add explicit PACKAGECONFIGs for all of compression formats that systemd can > detect at configure time, and an explicit enable/disable for importd. importd > defaults to disabled as it needs curl and all the compression formats to be > enabled. > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/recipes-core/systemd/systemd_228.bb | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-core/systemd/systemd_228.bb b/meta/recipes-core/systemd/systemd_228.bb > index 0f95390..6673042 100644 > --- a/meta/recipes-core/systemd/systemd_228.bb > +++ b/meta/recipes-core/systemd/systemd_228.bb > @@ -70,13 +70,13 @@ PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt" > # regardless of PACKAGECONFIG, libgcrypt is always required to expand > # the AM_PATH_LIBGCRYPT autoconf macro > DEPENDS += "libgcrypt" > -# Compress the journal > -PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" > PACKAGECONFIG[cryptsetup] = "--enable-libcryptsetup,--disable-libcryptsetup,cryptsetup" > PACKAGECONFIG[microhttpd] = "--enable-microhttpd,--disable-microhttpd,libmicrohttpd" > PACKAGECONFIG[elfutils] = "--enable-elfutils,--disable-elfutils,elfutils" > PACKAGECONFIG[resolved] = "--enable-resolved,--disable-resolved" > PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd" > +# importd requires curl/xz/zlib/bzip2/gcrypt > +PACKAGECONFIG[importd] = "--enable-importd,--disable-importd" Would it thow some sensible configure errors on enabling importd without the dependencies ? now that they are packageconfigs on their own. ? > PACKAGECONFIG[libidn] = "--enable-libidn,--disable-libidn,libidn" > PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit" > PACKAGECONFIG[manpages] = "--enable-manpages,--disable-manpages,libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" > @@ -92,6 +92,10 @@ PACKAGECONFIG[qrencode] = "--enable-qrencode,--disable-qrencode,qrencode" > PACKAGECONFIG[compat] = "--enable-compat-libs,--disable-compat-libs" > PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" > PACKAGECONFIG[coredump] = "--enable-coredump,--disable-coredump" > +PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" > +PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" > +PACKAGECONFIG[xz] = "--enable-xz,--disable-xz,xz" > +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" > > CACHED_CONFIGUREVARS += "ac_cv_path_KILL=${base_bindir}/kill" > CACHED_CONFIGUREVARS += "ac_cv_path_KMOD=${base_bindir}/kmod" > -- > 2.6.4 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] systemd: add more compression and importd PACKAGECONFIGs 2016-01-04 18:36 ` Khem Raj @ 2016-01-04 20:53 ` Burton, Ross 2016-01-05 21:10 ` Khem Raj 0 siblings, 1 reply; 5+ messages in thread From: Burton, Ross @ 2016-01-04 20:53 UTC (permalink / raw) To: Khem Raj; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 414 bytes --] On 4 January 2016 at 18:36, Khem Raj <raj.khem@gmail.com> wrote: > Would it thow some sensible configure errors on enabling importd > without the dependencies ? now that they are packageconfigs on their > own. ? > No, basically currently if you enable enough options then importd enables itself so the main aim here was to add some determinism to both all the compression backends and importd. Ross [-- Attachment #2: Type: text/html, Size: 817 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] systemd: add more compression and importd PACKAGECONFIGs 2016-01-04 20:53 ` Burton, Ross @ 2016-01-05 21:10 ` Khem Raj 0 siblings, 0 replies; 5+ messages in thread From: Khem Raj @ 2016-01-05 21:10 UTC (permalink / raw) To: Burton, Ross; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1.1: Type: text/plain, Size: 552 bytes --] > On Jan 4, 2016, at 12:53 PM, Burton, Ross <ross.burton@intel.com> wrote: > > > On 4 January 2016 at 18:36, Khem Raj <raj.khem@gmail.com <mailto:raj.khem@gmail.com>> wrote: > Would it thow some sensible configure errors on enabling importd > without the dependencies ? now that they are packageconfigs on their > own. ? > > No, basically currently if you enable enough options then importd enables itself so the main aim here was to add some determinism to both all the compression backends and importd. > OK thank you. > Ross [-- Attachment #1.2: Type: text/html, Size: 1561 bytes --] [-- Attachment #2: Message signed with OpenPGP using GPGMail --] [-- Type: application/pgp-signature, Size: 211 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-01-05 21:10 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-01-04 10:23 [PATCH 1/2] openjade: Fix build if not installing the libtool-garbage Ross Burton 2016-01-04 10:23 ` [PATCH 2/2] systemd: add more compression and importd PACKAGECONFIGs Ross Burton 2016-01-04 18:36 ` Khem Raj 2016-01-04 20:53 ` Burton, Ross 2016-01-05 21:10 ` Khem Raj
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox