diff options
| author |   Joe Kappus <joe@wt.gd> | 2023-03-26 02:57:29 -0400 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2023-04-16 08:29:35 +0100 |
| commit | bb135614d9ae38ddb898bea91eca25bc4b3a4711 (patch) | |
| tree | df6102ca43f6d24a2c08b60c901b0305908dcd93 /app-arch | |
| parent | app-arch/unrar: add 6.2.6 (diff) | |
| download | gentoo-bb135614d9ae38ddb898bea91eca25bc4b3a4711.tar.gz gentoo-bb135614d9ae38ddb898bea91eca25bc4b3a4711.tar.bz2 gentoo-bb135614d9ae38ddb898bea91eca25bc4b3a4711.zip | |
app-arch/unrar: 6.2.6 update patch
- Parallel build patch upstreamed
- Adapt honor-flags patch to new makefile
Signed-off-by: Joe Kappus <joe@wt.gd>
Closes: https://github.com/gentoo/gentoo/pull/29852
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/unrar/files/unrar-6.2.6-honor-flags.patch | 46 | ||||
| -rw-r--r-- | app-arch/unrar/unrar-6.2.6.ebuild | 5 |
2 files changed, 47 insertions, 4 deletions
diff --git a/app-arch/unrar/files/unrar-6.2.6-honor-flags.patch b/app-arch/unrar/files/unrar-6.2.6-honor-flags.patch new file mode 100644 index 000000000000..976f1417c861 --- /dev/null +++ b/app-arch/unrar/files/unrar-6.2.6-honor-flags.patch @@ -0,0 +1,46 @@ +Makefile: Honor {LD,CXX}FLAGS, add LIBFLAGS + + - append -pthread to LDFLAGS instead of replacing them + - use CXXFLAGS when linking + - append LIBFLAGS to the individual targets instead of the final link + +Gentoo-Bug: https://bugs.gentoo.org/461806 + +--- a/makefile ++++ b/makefile +@@ -8,7 +8,7 @@ LIBFLAGS=-fPIC + DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP + STRIP=strip + AR=ar +-LDFLAGS=-pthread ++LDFLAGS+=-pthread + DESTDIR=/usr + + # Linux using LCC +@@ -147,20 +147,21 @@ clean: + + unrar: $(OBJECTS) $(UNRAR_OBJ) + @rm -f unrar +- $(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) ++ $(LINK) -o unrar $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS) + $(STRIP) unrar + + sfx: WHAT=SFX_MODULE + sfx: $(OBJECTS) + @rm -f default.sfx +- $(LINK) -o default.sfx $(LDFLAGS) $(OBJECTS) ++ $(LINK) -o default.sfx $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) + $(STRIP) default.sfx + ++$(OBJECTS) $(LIB_OBJ): CXXFLAGS+=$(LIBFLAGS) ++ + lib: WHAT=RARDLL +-lib: CXXFLAGS+=$(LIBFLAGS) + lib: $(OBJECTS) $(LIB_OBJ) + @rm -f libunrar.* +- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) ++ $(LINK) -shared -o libunrar.so $(CXXFLAGS) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ) + $(AR) rcs libunrar.a $(OBJECTS) $(LIB_OBJ) + + install-unrar: +-- diff --git a/app-arch/unrar/unrar-6.2.6.ebuild b/app-arch/unrar/unrar-6.2.6.ebuild index 90027b6fdc7d..6de934f2ba86 100644 --- a/app-arch/unrar/unrar-6.2.6.ebuild +++ b/app-arch/unrar/unrar-6.2.6.ebuild @@ -16,10 +16,7 @@ LICENSE="unRAR" SLOT="0/6" # subslot = soname version KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris" -PATCHES=( - "${FILESDIR}"/${PN}-5.9.3-build.patch - "${FILESDIR}"/${PN}-5.5.5-honor-flags.patch -) +PATCHES="${FILESDIR}/${P}-honor-flags.patch" src_prepare() { default |