From 23bd0520d401ac1d8743d25666504184354c1bf5 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 25 May 2015 10:29:00 +0200 Subject: dev-libs/utf8proc: Fix build process, https://github.com/gentoo-science/sci/issues/427 Package-Manager: portage-2.2.20 --- dev-libs/utf8proc/ChangeLog | 7 ++++ .../utf8proc/files/utf8proc-1.2-buildflags.patch | 40 ++++++++++++++++++---- dev-libs/utf8proc/metadata.xml | 4 +-- dev-libs/utf8proc/utf8proc-1.2-r1.ebuild | 36 +++++++++++++++++++ dev-libs/utf8proc/utf8proc-1.2.ebuild | 31 ----------------- 5 files changed, 78 insertions(+), 40 deletions(-) create mode 100644 dev-libs/utf8proc/utf8proc-1.2-r1.ebuild delete mode 100644 dev-libs/utf8proc/utf8proc-1.2.ebuild (limited to 'dev-libs') diff --git a/dev-libs/utf8proc/ChangeLog b/dev-libs/utf8proc/ChangeLog index f822d346b..77d9155e2 100644 --- a/dev-libs/utf8proc/ChangeLog +++ b/dev-libs/utf8proc/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*utf8proc-1.2-r1 (25 May 2015) + + 25 May 2015; Justin Lecher +utf8proc-1.2-r1.ebuild, + -utf8proc-1.2.ebuild, files/utf8proc-1.2-buildflags.patch, metadata.xml: + dev-libs/utf8proc: Fix build process, https://github.com/gentoo- + science/sci/issues/427 + *utf8proc-1.2 (21 May 2015) 21 May 2015; Marius Brehler diff --git a/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch b/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch index 4d583e417..de8847cdf 100644 --- a/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch +++ b/dev-libs/utf8proc/files/utf8proc-1.2-buildflags.patch @@ -1,14 +1,40 @@ -Adjust build flags. Proted from 1.1.6. + Makefile | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) -Patch by Marius Brehler. ---- Makefile -+++ Makefile -@@ -6,7 +6,7 @@ AR=ar +diff --git a/Makefile b/Makefile +index aba2453..5fab07d 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,8 +6,8 @@ AR=ar INSTALL=install # compiler settings -cflags = -O2 -std=c99 -pedantic -Wall -fpic -DUTF8PROC_EXPORTS $(CFLAGS) -+cflags = -std=c99 -pedantic -fpic -DUTF8PROC_EXPORTS $(CFLAGS) - cc = $(CC) $(cflags) +-cc = $(CC) $(cflags) ++CFLAGS ?= -O2 ++CFLAGS += -std=c99 -pedantic -Wall -fpic -DUTF8PROC_EXPORTS # shared-library version MAJOR.MINOR.PATCH ... this may be *different* + # from the utf8proc version number because it indicates ABI compatibility, +@@ -54,18 +54,19 @@ data/utf8proc_data.c.new: libutf8proc.$(SHLIB_EXT) data/data_generator.rb data/c + $(MAKE) -C data utf8proc_data.c.new + + utf8proc.o: utf8proc.h utf8proc.c utf8proc_data.c +- $(cc) -c -o utf8proc.o utf8proc.c ++ $(CC) $(CFLAGS) -c -o utf8proc.o utf8proc.c + + libutf8proc.a: utf8proc.o + rm -f libutf8proc.a + $(AR) rs libutf8proc.a utf8proc.o + + libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH): utf8proc.o +- $(cc) -shared -o $@ -Wl,-soname -Wl,libutf8proc.so.$(MAJOR) utf8proc.o ++ $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname -Wl,libutf8proc.so.$(MAJOR) utf8proc.o + chmod a-x $@ + + libutf8proc.so: libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH) + ln -f -s libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH) $@ ++ ln -f -s libutf8proc.so.$(MAJOR).$(MINOR).$(PATCH) $@.$(MAJOR) + + libutf8proc.$(MAJOR).dylib: utf8proc.o + $(cc) -dynamiclib -o $@ $^ -install_name $(libdir)/$@ -Wl,-compatibility_version -Wl,$(MAJOR) -Wl,-current_version -Wl,$(MAJOR).$(MINOR).$(PATCH) diff --git a/dev-libs/utf8proc/metadata.xml b/dev-libs/utf8proc/metadata.xml index f8fff5b6f..740304bf0 100644 --- a/dev-libs/utf8proc/metadata.xml +++ b/dev-libs/utf8proc/metadata.xml @@ -1,8 +1,8 @@ -sci - + sci + utf8proc is a library for processing UTF-8 encoded Unicode strings. Some features are Unicode normalization, stripping of default ignorable characters, case folding and detection of grapheme diff --git a/dev-libs/utf8proc/utf8proc-1.2-r1.ebuild b/dev-libs/utf8proc/utf8proc-1.2-r1.ebuild new file mode 100644 index 000000000..e00835dec --- /dev/null +++ b/dev-libs/utf8proc/utf8proc-1.2-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +inherit eutils toolchain-funcs + +DESCRIPTION="library for processing UTF-8 encoded Unicode strings" +HOMEPAGE="http://www.public-software-group.org/utf8proc" +SRC_URI="https://github.com/JuliaLang/${PN}/archive/v1.2.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="static-libs" + +src_prepare() { + epatch "${FILESDIR}"/"${P}"-buildflags.patch +} + +src_compile() { + emake \ + libutf8proc.so \ + $(usex static-libs libutf8proc.a "") \ + CC=$(tc-getCC) \ + AR=$(tc-getAR) +# CFLAGS="${CFLAGS}" +# LDFLAGS="${LDFLAGS} -Wl,--soname,lib${PN}.${PV}" +} + +src_install() { + doheader utf8proc.h + dolib.so libutf8proc.so* + use static-libs && dolib.a libutf8proc.a +} diff --git a/dev-libs/utf8proc/utf8proc-1.2.ebuild b/dev-libs/utf8proc/utf8proc-1.2.ebuild deleted file mode 100644 index 349806f39..000000000 --- a/dev-libs/utf8proc/utf8proc-1.2.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -inherit eutils - -DESCRIPTION="library for processing UTF-8 encoded Unicode strings" -HOMEPAGE="http://www.public-software-group.org/utf8proc" -SRC_URI="https://github.com/JuliaLang/${PN}/archive/v1.2.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="static-libs" - -src_prepare() { - epatch "${FILESDIR}"/"${P}"-buildflags.patch -} - -src_compile() { - emake libutf8proc.so - use static-libs & emake libutf8proc.a -} - -src_install() { - doheader utf8proc.h - dolib.so libutf8proc.so - use static-libs && dolib.a libutf8proc.a -} -- cgit v1.2.3-65-gdbad