Skip to content

Commit

Permalink
Workaround for missing updated libgcc.i686
Browse files Browse the repository at this point in the history
Dnf don't like the same package for different architectures to be in
different version, which prevent installing updated gcc. Force it by
explicitly specifying libgcc.x86_64.

This is ugly, especially the part about exact gcc version, but since
fc25 is EOL, it shouldn't result in any problems...
  • Loading branch information
marmarek committed Mar 2, 2018
1 parent 7c1931d commit b79f692
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions Makefile.builder
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ else ifeq ($(PACKAGE_SET),vm)
endif
endif

ifeq ($(DIST),fc25)
SOURCE_PREP := workaround-gcc-upgrade-fc25
endif

source-debian-xen-copy-in: VERSION = $(shell cat $(ORIG_SRC)/version)
source-debian-xen-copy-in: ORIG_FILE = "$(CHROOT_DIR)/$(DIST_SRC)/xen_$(VERSION).orig.tar.gz"
Expand All @@ -19,3 +22,6 @@ source-debian-xen-copy-in:
-$(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian-vm.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches
tar xfz $(SRC_FILE) -C $(CHROOT_DIR)/$(DIST_SRC)/debian-vm --strip-components=1
tar cfz $(ORIG_FILE) --exclude-vcs --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC)/debian-vm .

workaround-gcc-upgrade-fc25:
sudo chroot $(CHROOT_DIR) dnf install -y gcc-6.4.1-1.qubes1.fc25.x86_64 libgcc.x86_64

0 comments on commit b79f692

Please sign in to comment.