keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
f35afb197d
rpm-ostree/Makefile-libdnf.am

38 lines
1.3 KiB
Plaintext
Raw Normal View History

Switch to using libhif as a git submodule So I was trying to hack on my host's copy of rpm-ostree inside a pet docker container, but ran into a conflict with libhif since dnf uses it. I think we basically need to *always* build the bundled path, rather than what I'm doing with CAHC and FADC where it's built as a regular RPM. It's not really sustainable right now for us to have both bundled and not-bundled build paths - and we need to support co-installation with dnf. Another major issue is that we want to version lock with libhif - right now our CI and both CAHC/FADC track libhif master, but that means everything breaks if libhif breaks and we don't immediately port. git submodules solve all of these problems - the same as we're doing with libglnx. libglnx is *designed* for use as a git submodule, where as libhif needs to support being both bundled and not-bundled. So we end up with some hacks on our side, but I think it's all not too bad. I've marked build rules with `# bundled libhif` so we know where to find them later when libhif is stable. Closes: #357 Approved by: jlebon
2016-06-29 04:33:02 +03:00
# Makefile for C source code
#
# Copyright (C) 2016 Colin Walters <walters@verbum.org>
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2 of the License, or (at your option) any later version.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
build: Always recurse build into libdnf/ This has bitten me many times already; switching libdnf submodule (or just editing the code directly in the submodule dir to add debug prints) didn't rebuild libdnf. Recursing the build: cheap ¢. Not spending a half hour figuring out the code you're debugging isn't what you typed: priceless 💸. Closes: #733 Approved by: jlebon
2017-04-13 04:18:54 +03:00
# Recurse into libdnf
ALL_LOCAL_HOOKS += libdnf-local
libdnf-local:
build-sys: Propagate verbosity into libdnf I'm trying to debug a libdnf build issue with the rpm-injected `export LDFLAGS='-Wl,-z,relro ...` and it's very helpful to have `--disable-silent-rules` or `make V=1` do the right thing automatically for CMake too. Closes: #1520 Approved by: peterbaouoft
2018-08-27 20:15:50 +03:00
cd libdnf-build && $(MAKE) $(if $(subst 0,,$(V)),VERBOSE=1,)
Rebase to latest libdnf This brings us back in sync with the latest libdnf git master. This required a bunch of work both on the libdnf and rpm-ostree side to get working. See e.g. https://github.com/rpm-software-management/libdnf/issues/645. A few things to adapt to: - soname bump to `libdnf.so.2` - `DnfAdvisory` is no longer a `GObject` (annoyingly it's not replaced by something we can keep a ref on, so this requires some hacks to steal from the `GPtrArray` -- could enhance libdnf for this later) - disable SWDB history writing - use new reldep public API - update for latest `hy_subject_get_best_selector()` API This now unlocks the possibility to add support for modules. (One can see hints of this in the diff by the fact that `libdnf` links to `libmodulemd1`.) Update submodule: libdnf Closes: #1404 Approved by: cgwalters
2019-03-14 17:06:31 +03:00
ln -sf libdnf-build/libdnf/libdnf.so.2 .
libdnf.so.2: libdnf-local
CLEANFILES += libdnf.so.2
Update for libhif -> libdnf Still not many PRs outstanding, so it's a good time to take this plunge. Mostly automated via `sed`. Closes: #416 Approved by: Conan-Kudo
2016-08-03 21:30:17 +03:00
GITIGNOREFILES += libdnf-build/
Switch to using libhif as a git submodule So I was trying to hack on my host's copy of rpm-ostree inside a pet docker container, but ran into a conflict with libhif since dnf uses it. I think we basically need to *always* build the bundled path, rather than what I'm doing with CAHC and FADC where it's built as a regular RPM. It's not really sustainable right now for us to have both bundled and not-bundled build paths - and we need to support co-installation with dnf. Another major issue is that we want to version lock with libhif - right now our CI and both CAHC/FADC track libhif master, but that means everything breaks if libhif breaks and we don't immediately port. git submodules solve all of these problems - the same as we're doing with libglnx. libglnx is *designed* for use as a git submodule, where as libhif needs to support being both bundled and not-bundled. So we end up with some hacks on our side, but I think it's all not too bad. I've marked build rules with `# bundled libhif` so we know where to find them later when libhif is stable. Closes: #357 Approved by: jlebon
2016-06-29 04:33:02 +03:00
Update for libhif -> libdnf Still not many PRs outstanding, so it's a good time to take this plunge. Mostly automated via `sed`. Closes: #416 Approved by: Conan-Kudo
2016-08-03 21:30:17 +03:00
install-libdnf-hook:
Switch to using libhif as a git submodule So I was trying to hack on my host's copy of rpm-ostree inside a pet docker container, but ran into a conflict with libhif since dnf uses it. I think we basically need to *always* build the bundled path, rather than what I'm doing with CAHC and FADC where it's built as a regular RPM. It's not really sustainable right now for us to have both bundled and not-bundled build paths - and we need to support co-installation with dnf. Another major issue is that we want to version lock with libhif - right now our CI and both CAHC/FADC track libhif master, but that means everything breaks if libhif breaks and we don't immediately port. git submodules solve all of these problems - the same as we're doing with libglnx. libglnx is *designed* for use as a git submodule, where as libhif needs to support being both bundled and not-bundled. So we end up with some hacks on our side, but I think it's all not too bad. I've marked build rules with `# bundled libhif` so we know where to find them later when libhif is stable. Closes: #357 Approved by: jlebon
2016-06-29 04:33:02 +03:00
install -d -m 0755 $(DESTDIR)$(libdir)/rpm-ostree
Rebase to latest libdnf This brings us back in sync with the latest libdnf git master. This required a bunch of work both on the libdnf and rpm-ostree side to get working. See e.g. https://github.com/rpm-software-management/libdnf/issues/645. A few things to adapt to: - soname bump to `libdnf.so.2` - `DnfAdvisory` is no longer a `GObject` (annoyingly it's not replaced by something we can keep a ref on, so this requires some hacks to steal from the `GPtrArray` -- could enhance libdnf for this later) - disable SWDB history writing - use new reldep public API - update for latest `hy_subject_get_best_selector()` API This now unlocks the possibility to add support for modules. (One can see hints of this in the diff by the fact that `libdnf` links to `libmodulemd1`.) Update submodule: libdnf Closes: #1404 Approved by: cgwalters
2019-03-14 17:06:31 +03:00
install -m 0755 $$(readlink libdnf.so.2) $(DESTDIR)$(libdir)/rpm-ostree
Update for libhif -> libdnf Still not many PRs outstanding, so it's a good time to take this plunge. Mostly automated via `sed`. Closes: #416 Approved by: Conan-Kudo
2016-08-03 21:30:17 +03:00
INSTALL_DATA_HOOKS += install-libdnf-hook
Makefile-hif.am: link by force and add clean hook Add a clean hook so that `make clean` on the top dir also cleans the libhif artifacts. Add -f to `ln` -- Make marks the target as out-of-date if the symlink breaks (which will happen if you just `make clean` in the libhif-build dir), but the `ln` will cause the build to fail since it already exists. Closes: #377 Approved by: cgwalters
2016-07-06 16:08:35 +03:00
Update for libhif -> libdnf Still not many PRs outstanding, so it's a good time to take this plunge. Mostly automated via `sed`. Closes: #416 Approved by: Conan-Kudo
2016-08-03 21:30:17 +03:00
clean-local: clean-local-dnf
.PHONY: clean-local-dnf
clean-local-dnf:
cd libdnf-build && $(MAKE) clean
Reference in New Issue Copy Permalink