diff options
38 files changed, 226 insertions, 1337 deletions
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index 7e2f9eb90863..c36ac90133e5 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,6 +1,2 @@ -DIST julia-0.5.0-bundled.tar.gz 3461547 SHA256 3f4887fc2c0112666eb28b99f86bd8f7bd50615325e03135c546127885d46fbf SHA512 f8df589edf7d6b0e1e6553583c81d26fd256a79cacd79fbdd0ea1a9eea46b2466e3cbf055b5b7aa2d5c08318a5c35b9c09a30ac46a48689cc5c7245954b615c8 WHIRLPOOL b0137b2ed55aef7dc2c1a8693043ce63305bd2bbb5c2f959b2752fdb68189a506b027b467bfc0bb443fa4202f3735dd9410a257adec08302dfcaa0c9e4bfed98 -DIST julia-0.5.0.tar.gz 6326490 SHA256 bb62a14806e58f079ecd4941d4a18d1f1c1d89ab33c826d3a58a2244e364112e SHA512 6d76c5050da5050cd541c8407c35c8ecd60ad2ba61c4defcc5c084aaeb09e82ffed09be79a3453000bdf88efe56039948335bab21c8389389ffb8b29806568de WHIRLPOOL 7f0066cc7fa912fe7ce5b6bf43449d828b0b9dcf2ab57df6c13a0df17ee53351c6deb30e7b998dc00ff53c548074d79ed6288bc79507afebc4fd827b3e3c032f -DIST julia-0.6.0-bundled.tar.gz 2097663 BLAKE2B 4f16b636e10cbaf9ebd8394d0341c16d7cd7244b6e1467f264150cee64dd8f33aba7381670b7f66f822dd06eaa55d18b0ed04b38931a1943a8212275c1854c26 SHA512 50581da3628930b2d1b89d226f3551fa7b18ca23c322b7e93d1227cc0c3428f255a6087f9859ff2c592014407d53238e01a3847a727a87287fb8c7f679b022d1 -DIST julia-0.6.0.tar.gz 5565427 BLAKE2B e48b06d38b5332a7949421d248ccd47f8818630197c29604ee1b3ce404e652b4fa8fb8f720abd3b9470a8b9c3e22e10f35a987aed6924f98122e4ee838817af0 SHA512 da21b35eb2c682c0fb8720974a76759c51fe993f10e6af5ca4864fc7f0bb6c90d880b706eb798476c7228bae2db19ff0825add6a2abde2961f16a93a3050cb69 DIST julia-0.6.1-bundled.tar.gz 2097663 BLAKE2B 4f16b636e10cbaf9ebd8394d0341c16d7cd7244b6e1467f264150cee64dd8f33aba7381670b7f66f822dd06eaa55d18b0ed04b38931a1943a8212275c1854c26 SHA512 50581da3628930b2d1b89d226f3551fa7b18ca23c322b7e93d1227cc0c3428f255a6087f9859ff2c592014407d53238e01a3847a727a87287fb8c7f679b022d1 DIST julia-0.6.1.tar.gz 5587691 BLAKE2B b230e717bf4a4f63319883b87bae5b51a2dd2d0be61ffc15eb89304fe6394df67416ed11d40f258a13d7f3ce4272452cfbe1bd482c368d70cb0d3eea9512d8f9 SHA512 8e7b14e8bba1eae1d2a7f43a114dc42e1870d2e692d8892a09475f48839c9b596eb8aaa24b111d3bac6836282a4d7ab64d10c4481c8193f1574cabcf2541db6e diff --git a/dev-lang/julia/files/julia-0.5.0-fix_build_system.patch b/dev-lang/julia/files/julia-0.5.0-fix_build_system.patch deleted file mode 100644 index e54b9a48fbbf..000000000000 --- a/dev-lang/julia/files/julia-0.5.0-fix_build_system.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/Make.inc b/Make.inc -index 651c9df..ff01872 100644 ---- a/Make.inc -+++ b/Make.inc -@@ -389,7 +389,7 @@ ifneq ($(OS), WINNT) - JCXXFLAGS += -pedantic - endif - DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -ggdb2 -falign-functions -+SHIPFLAGS := GENTOOCFLAGS - endif - - ifeq ($(USECLANG),1) -@@ -400,7 +400,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 - JCPPFLAGS := -fasynchronous-unwind-tables - JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic - DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -g -+SHIPFLAGS := GENTOOCFLAGS - ifeq ($(OS), Darwin) - ifeq ($(USE_LIBCPP), 1) - CC += -stdlib=libc++ -mmacosx-version-min=10.7 -@@ -427,7 +427,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64 - JCPPFLAGS := - JCXXFLAGS := -pipe $(fPIC) -fno-rtti - DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all --SHIPFLAGS := -O3 -g -falign-functions -+SHIPFLAGS := GENTOOCFLAGS - endif - - ifeq ($(USECCACHE), 1) -diff --git a/doc/Makefile b/doc/Makefile -index 0749d73..f4d49ec 100644 ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -62,7 +62,7 @@ help: - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - - clean: -- -rm -rf _build/* -+ @echo "Do not clean doc/_build/html. Just use it..." - - cleanall: clean - -diff --git a/src/Makefile b/src/Makefile -index d7ec864..61d2470 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -66,20 +66,8 @@ HEADERS := $(addprefix $(SRCDIR)/,julia.h julia_threads.h julia_internal.h optio - - # In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs - # In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries. --ifneq ($(USE_LLVM_SHLIB),1) --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null) --else --ifeq ($(LLVM_USE_CMAKE),1) --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM --else --ifeq ($(OS),WINNT) --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(LLVM_VER_SHORT) --else --LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM-$(shell $(LLVM_CONFIG_HOST) --version) --endif # OS == WINNT --endif # LLVM_USE_CMAKE == 1 -+LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs) - FLAGS += -DLLVM_SHLIB --endif # USE_LLVM_SHLIB == 1 - - COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS) - DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS) ---- a/deps/tools/jldownload -+++ b/deps/tools/jldownload -@@ -5,9 +5,9 @@ - - CACHE_HOST=https://cache.julialang.org - --WGET=$(which wget 2>/dev/null) --CURL=$(which curl 2>/dev/null) --FETCH=$(which fetch 2>/dev/null) -+WGET=/bin/true -+CURL=/bin/true -+FETCH=/bin/true - - TIMEOUT=15 # seconds - WGET_OPTS="--no-check-certificate --tries=1 --timeout=$TIMEOUT" diff --git a/dev-lang/julia/julia-0.5.0-r3.ebuild b/dev-lang/julia/julia-0.5.0-r3.ebuild deleted file mode 100644 index 4c4fc298ecfe..000000000000 --- a/dev-lang/julia/julia-0.5.0-r3.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -RESTRICT="test" - -inherit elisp-common eutils multilib pax-utils toolchain-funcs - -DESCRIPTION="High-performance programming language for technical computing" -HOMEPAGE="https://julialang.org/" -SRC_URI=" - https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz - https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="emacs" - -RDEPEND=" - dev-lang/R:0= - dev-libs/double-conversion:0= - dev-libs/gmp:0= - <dev-libs/libgit2-0.25:0= - dev-libs/mpfr:0= - dev-libs/openspecfun - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/cholmod:0= - sci-libs/fftw:3.0=[threads] - sci-libs/openlibm:0= - sci-libs/spqr:0= - sci-libs/umfpack:0= - sci-mathematics/glpk:0= - >=sys-devel/llvm-3.9:0= - >=sys-libs/libunwind-1.1:7= - sys-libs/readline:0= - sys-libs/zlib:0= - >=virtual/blas-3.6 - virtual/lapack - emacs? ( app-emacs/ess )" - -DEPEND="${RDEPEND} - dev-util/patchelf - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${PN}-0.5.0-fix_build_system.patch -) - -src_prepare() { - mkdir deps/srccache || die - mv "${WORKDIR}"/bundled/* deps/srccache || die - rmdir "${WORKDIR}"/bundled || die - - epatch "${PATCHES[@]}" - - eapply_user - - # Sledgehammer: - # - prevent fetching of bundled stuff in compile and install phase - # - respect CFLAGS - # - respect EPREFIX and Gentoo specific paths - # - fix BLAS and LAPACK link interface - - sed -i \ - -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \ - -e 's|git submodule|${EPREFIX}/bin/true|g' \ - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ - -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \ - deps/Makefile || die - - local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)" - libblas="${libblas%% *}" - libblas="lib${libblas#-l}" - local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)" - liblapack="${liblapack%% *}" - liblapack="lib${liblapack#-l}" - - sed -i \ - -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \ - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ - -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \ - -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \ - -e "s|/usr/include|${EPREFIX}/usr/include|" \ - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \ - -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \ - -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \ - -e "s|= libblas|= ${libblas}|" \ - -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \ - -e "s|= liblapack|= ${liblapack}|" \ - Make.inc || die - - sed -i \ - -e "s|,lib)|,$(get_libdir))|g" \ - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \ - Makefile || die - - sed -i \ - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ - src/Makefile || die -} - -src_configure() { - # julia does not play well with the system versions of - # dsfmt, libuv, pcre2 and utf8proc - cat <<-EOF > Make.user - USE_SYSTEM_DSFMT=0 - USE_SYSTEM_LIBUV=0 - USE_SYSTEM_PCRE=0 - USE_SYSTEM_RMATH=0 - USE_SYSTEM_UTF8PROC=0 - USE_LLVM_SHLIB=1 - USE_SYSTEM_ARPACK=1 - USE_SYSTEM_BLAS=1 - USE_SYSTEM_FFTW=1 - USE_SYSTEM_GMP=1 - USE_SYSTEM_GRISU=1 - USE_SYSTEM_LAPACK=1 - USE_SYSTEM_LIBGIT2=1 - USE_SYSTEM_LIBM=1 - USE_SYSTEM_LIBUNWIND=1 - USE_SYSTEM_LLVM=1 - USE_SYSTEM_MPFR=1 - USE_SYSTEM_OPENLIBM=1 - USE_SYSTEM_OPENSPECFUN=1 - USE_SYSTEM_PATCHELF=1 - USE_SYSTEM_READLINE=1 - USE_SYSTEM_SUITESPARSE=1 - USE_SYSTEM_ZLIB=1 - VERBOSE=1 - libdir="${EROOT}/usr/$(get_libdir)" - EOF - -} - -src_compile() { - - # Julia accesses /proc/self/mem on Linux - addpredict /proc/self/mem - - emake cleanall - emake julia-release \ - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" - pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') - emake - use emacs && elisp-compile contrib/julia-mode.el -} - -src_test() { - emake test -} - -src_install() { - emake install \ - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" - cat > 99julia <<-EOF - LDPATH=${EROOT%/}/usr/$(get_libdir)/julia - EOF - doenvd 99julia - - if use emacs; then - elisp-install "${PN}" contrib/julia-mode.el - elisp-site-file-install "${FILESDIR}"/63julia-gentoo.el - fi - dodoc README.md - - mv "${ED}"/usr/etc/julia "${ED}"/etc || die - rmdir "${ED}"/usr/etc || die - rmdir "${ED}"/usr/libexec || die - mv "${ED}"/usr/share/doc/julia/{examples,html} \ - "${ED}"/usr/share/doc/${PF} || die - rmdir "${ED}"/usr/share/doc/julia || die - if [[ $(get_libdir) != lib ]]; then - mkdir -p "${ED}"/usr/$(get_libdir) || die - mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/dev-lang/julia/julia-0.6.0-r1.ebuild b/dev-lang/julia/julia-0.6.0-r1.ebuild deleted file mode 100644 index 5ed204df56cb..000000000000 --- a/dev-lang/julia/julia-0.6.0-r1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -RESTRICT="test" - -inherit eutils multilib pax-utils toolchain-funcs - -DESCRIPTION="High-performance programming language for technical computing" -HOMEPAGE="https://julialang.org/" -SRC_URI=" - https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz - https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - dev-libs/double-conversion:0= - dev-libs/gmp:0= - <dev-libs/libgit2-0.25:0= - dev-libs/mpfr:0= - dev-libs/openspecfun - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/cholmod:0= - sci-libs/fftw:3.0=[threads] - sci-libs/openlibm:0= - sci-libs/spqr:0= - >=dev-libs/libpcre2-10.23:0=[jit] - sci-libs/umfpack:0= - sci-mathematics/glpk:0= - sys-devel/llvm:4= - >=sys-libs/libunwind-1.1:7= - <sys-libs/libunwind-1.2.1 - sys-libs/readline:0= - sys-libs/zlib:0= - >=virtual/blas-3.6 - virtual/lapack" - -DEPEND="${RDEPEND} - dev-vcs/git - dev-util/patchelf - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-fix_build_system.patch -) - -src_prepare() { - mv "${WORKDIR}"/bundled/UnicodeData.txt doc || die - mkdir deps/srccache || die - mv "${WORKDIR}"/bundled/* deps/srccache || die - rmdir "${WORKDIR}"/bundled || die - - default - - # Sledgehammer: - # - prevent fetching of bundled stuff in compile and install phase - # - respect CFLAGS - # - respect EPREFIX and Gentoo specific paths - # - fix BLAS and LAPACK link interface - - sed -i \ - -e 's|$(JLDOWNLOAD)|${EPREFIX}/bin/true|' \ - -e 's|git submodule|${EPREFIX}/bin/true|g' \ - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ - -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \ - deps/Makefile || die - - local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)" - libblas="${libblas%% *}" - libblas="lib${libblas#-l}" - local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)" - liblapack="${liblapack%% *}" - liblapack="lib${liblapack#-l}" - - sed -i \ - -e "s|\(JULIA_EXECUTABLE = \)\(\$(JULIAHOME)/julia\)|\1 LD_LIBRARY_PATH=\$(BUILD)/$(get_libdir) \2|" \ - -e "s|GENTOOCFLAGS|${CFLAGS}|g" \ - -e "s|LIBDIR = lib|LIBDIR = $(get_libdir)|" \ - -e "s|/usr/lib|${EPREFIX}/usr/$(get_libdir)|" \ - -e "s|/usr/include|${EPREFIX}/usr/include|" \ - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|" \ - -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \ - -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \ - -e "s|= libblas|= ${libblas}|" \ - -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \ - -e "s|= liblapack|= ${liblapack}|" \ - Make.inc || die - - sed -i \ - -e "s|,lib)|,$(get_libdir))|g" \ - -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \ - Makefile || die - - sed -i \ - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ - src/Makefile || die - - # disable doc install starting git fetching - sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die -} - -src_configure() { - # julia does not play well with the system versions of dsfmt, libuv, - # and utf8proc - - # USE_SYSTEM_LIBM=0 implies using external openlibm - cat <<-EOF > Make.user - USE_SYSTEM_DSFMT=0 - USE_SYSTEM_LIBUV=0 - USE_SYSTEM_PCRE=1 - USE_SYSTEM_RMATH=0 - USE_SYSTEM_UTF8PROC=0 - USE_LLVM_SHLIB=1 - USE_SYSTEM_ARPACK=1 - USE_SYSTEM_BLAS=1 - USE_SYSTEM_FFTW=1 - USE_SYSTEM_GMP=1 - USE_SYSTEM_GRISU=1 - USE_SYSTEM_LAPACK=1 - USE_SYSTEM_LIBGIT2=1 - USE_SYSTEM_LIBM=0 - USE_SYSTEM_LIBUNWIND=1 - USE_SYSTEM_LLVM=1 - USE_SYSTEM_MPFR=1 - USE_SYSTEM_OPENLIBM=1 - USE_SYSTEM_OPENSPECFUN=1 - USE_SYSTEM_PATCHELF=1 - USE_SYSTEM_READLINE=1 - USE_SYSTEM_SUITESPARSE=1 - USE_SYSTEM_ZLIB=1 - VERBOSE=1 - libdir="${EROOT}/usr/$(get_libdir)" - EOF - -} - -src_compile() { - - # use LLVM:4 ... - export PATH="${EPREFIX}/usr/lib/llvm/4/bin/:${PATH}" - - # Julia accesses /proc/self/mem on Linux - addpredict /proc/self/mem - - emake cleanall - emake VERBOSE=1 julia-release \ - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" - pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}') - emake -} - -src_test() { - emake test -} - -src_install() { - # Julia is special. It tries to find a valid git repository (that would - # normally be cloned during compilation/installation). Just make it - # happy... - git init && \ - git config --local user.email "whatyoudoing@example.com" && \ - git config --local user.name "Whyyyyyy" && \ - git commit -a --allow-empty -m "initial" || die "git failed" - - emake install \ - prefix="/usr" DESTDIR="${D}" CC="$(tc-getCC)" CXX="$(tc-getCXX)" - cat > 99julia <<-EOF - LDPATH=${EROOT%/}/usr/$(get_libdir)/julia - EOF - doenvd 99julia - - dodoc README.md - - mv "${ED}"/usr/etc/julia "${ED}"/etc || die - rmdir "${ED}"/usr/etc || die - mv "${ED}"/usr/share/doc/julia/{examples,html} \ - "${ED}"/usr/share/doc/${PF} || die - rmdir "${ED}"/usr/share/doc/julia || die - if [[ $(get_libdir) != lib ]]; then - mkdir -p "${ED}"/usr/$(get_libdir) || die - mv "${ED}"/usr/lib/julia "${ED}"/usr/$(get_libdir)/julia || die - fi -} diff --git a/dev-lang/julia/julia-0.6.1.ebuild b/dev-lang/julia/julia-0.6.1-r1.ebuild index 4fcd1c6d026d..8c9dbc67613d 100644 --- a/dev-lang/julia/julia-0.6.1.ebuild +++ b/dev-lang/julia/julia-0.6.1-r1.ebuild @@ -5,7 +5,7 @@ EAPI=6 RESTRICT="test" -inherit eutils multilib pax-utils toolchain-funcs +inherit llvm pax-utils toolchain-funcs DESCRIPTION="High-performance programming language for technical computing" HOMEPAGE="https://julialang.org/" @@ -19,7 +19,13 @@ SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" +# julia 0.6* is compatible with llvm-4 RDEPEND=" + sys-devel/llvm:4= + sys-devel/clang:4=" +LLVM_MAX_SLOT=4 + +RDEPEND+=" dev-libs/double-conversion:0= dev-libs/gmp:0= <dev-libs/libgit2-0.25:0= @@ -34,7 +40,6 @@ RDEPEND=" >=dev-libs/libpcre2-10.23:0=[jit] sci-libs/umfpack:0= sci-mathematics/glpk:0= - sys-devel/llvm:4= >=sys-libs/libunwind-1.1:7= <sys-libs/libunwind-1.2.1 sys-libs/readline:0= @@ -145,9 +150,6 @@ src_configure() { src_compile() { - # use LLVM:4 ... - export PATH="${EPREFIX}/usr/lib/llvm/4/bin/:${PATH}" - # Julia accesses /proc/self/mem on Linux addpredict /proc/self/mem diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild index fd0c49b3d426..86d5657b25d8 100644 --- a/dev-lang/julia/julia-9999.ebuild +++ b/dev-lang/julia/julia-9999.ebuild @@ -5,7 +5,7 @@ EAPI=6 RESTRICT="test" -inherit git-r3 elisp-common eutils multilib pax-utils toolchain-funcs +inherit git-r3 llvm pax-utils toolchain-funcs DESCRIPTION="High-performance programming language for technical computing" HOMEPAGE="https://julialang.org/" @@ -18,6 +18,10 @@ KEYWORDS="" IUSE="" RDEPEND=" + >=sys-devel/llvm-4.0.0:= + >=sys-devel/clang-4.0.0:=" + +RDEPEND+=" dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= @@ -32,7 +36,6 @@ RDEPEND=" >=dev-libs/libpcre2-10.23:0=[jit] sci-libs/umfpack:0= sci-mathematics/glpk:0= - >=sys-devel/llvm-4.0.0:= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= diff --git a/dev-python/clang-python/clang-python-5.0.9999.ebuild b/dev-python/clang-python/clang-python-5.0.9999.ebuild index 3310c5b2e313..6741f9636801 100644 --- a/dev-python/clang-python/clang-python-5.0.9999.ebuild +++ b/dev-python/clang-python/clang-python-5.0.9999.ebuild @@ -31,6 +31,11 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${P}/bindings/python +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' bindings/python +} + src_test() { python_foreach_impl nosetests -v || die } diff --git a/dev-python/clang-python/clang-python-9999.ebuild b/dev-python/clang-python/clang-python-9999.ebuild index 854d44c3f77b..d59b5b98bb8f 100644 --- a/dev-python/clang-python/clang-python-9999.ebuild +++ b/dev-python/clang-python/clang-python-9999.ebuild @@ -29,6 +29,11 @@ DEPEND="${RDEPEND}" S=${WORKDIR}/${P}/bindings/python +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' bindings/python +} + src_test() { python_foreach_impl python -m unittest discover -v || die } diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest index 4e9435ddacb9..83407edbbbbd 100644 --- a/dev-python/docutils-glep/Manifest +++ b/dev-python/docutils-glep/Manifest @@ -1,2 +1,3 @@ -DIST docutils-glep-1.0.tar.gz 5180 SHA256 5b1e4f7e871875a5239e754728167315d0dbc2f2349b7e948d5fb790219ad06d SHA512 971987452ed8cdffd98121b14d94978e70f4436a1f6cd22c7d491e648859731907f4ed0c073c69d618a95f6c81422c5cb03e0368568224a335876a7f9c8fd89e WHIRLPOOL e2b81d046996d4536503a3c51745399c81406571521acfff65c3a6c626365b11e10995ce85dee0bd9f9462804a14385d8352677caa8a788c972a62b215e43d6c +DIST docutils-glep-1.0.tar.gz 5180 BLAKE2B 771f09aa90eb4cdafe874b276d3e8ac04a3af67ee0292cb9b41a8a24bab54bd7e19ab2f718a32a5fdd7966432b2c978addbfe3f3d3efb1ca2eef37b1a079d91f SHA512 971987452ed8cdffd98121b14d94978e70f4436a1f6cd22c7d491e648859731907f4ed0c073c69d618a95f6c81422c5cb03e0368568224a335876a7f9c8fd89e +DIST docutils_glep-1.1.tar.gz 6753 BLAKE2B 93e7fa03e6e5b4f7d7d338b04d906eac630d2a8e179af14c0c3f0d5f9926cc3705dcec84d2b9b2b7b3854bf9de178256ad2c4ef4bc567c6ba0d95d2abc32b8ac SHA512 7b06cbc7bf7a7f9002e1d61fbbafdb7ee6fa804145e7ce7edc547384f22cac8f9a9072bc137e201ab08a49eedb5e4f2ea8a1f02bd806d7d01525bdedece4afb8 DIST glep-0.4-r1.tbz2 4667 SHA256 d0b421869fb3437e96484687fd57f34d4f5cdd5a1fbdb2314f1474b1f9afa058 SHA512 098d9f5043a60af9dfac63f6472b576e66ffeda924902ca825ed63f573aeb8bad7c9f9a6853fd99e648683488ee6db2ee55c139df3dde06983b72cfb5dd8cdd3 WHIRLPOOL 277cdf4a7fe70990864a4f0fd592561bcf5edc1de8d4830da96c75093d47d8d64214b95ac5ae7960670a8520650a5e23355df248f61bddcd9cd5dc23cab0fe19 diff --git a/dev-python/docutils-glep/docutils-glep-1.1.ebuild b/dev-python/docutils-glep/docutils-glep-1.1.ebuild new file mode 100644 index 000000000000..76ae3b34e333 --- /dev/null +++ b/dev-python/docutils-glep/docutils-glep-1.1.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy ) + +inherit distutils-r1 + +MY_PN=${PN/-/_} +MY_P=${MY_PN}-${PV} +DESCRIPTION="Gentoo GLEP support for docutils" +HOMEPAGE="https://github.com/gentoo/docutils-glep/" +SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}] + ${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND}" + +S=${WORKDIR}/${MY_P} diff --git a/dev-python/docutils-glep/docutils-glep-9999.ebuild b/dev-python/docutils-glep/docutils-glep-9999.ebuild index e6476c34c896..7e55e43f001b 100644 --- a/dev-python/docutils-glep/docutils-glep-9999.ebuild +++ b/dev-python/docutils-glep/docutils-glep-9999.ebuild @@ -17,4 +17,7 @@ SLOT="0" KEYWORDS="" IUSE="" -RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]" +COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}] + ${COMMON_DEPEND}" +DEPEND="${COMMON_DEPEND}" diff --git a/dev-python/lit/lit-5.0.9999.ebuild b/dev-python/lit/lit-5.0.9999.ebuild index 61b9ce3ec021..6d9f12eb032a 100644 --- a/dev-python/lit/lit-5.0.9999.ebuild +++ b/dev-python/lit/lit-5.0.9999.ebuild @@ -29,6 +29,11 @@ DEPEND=" # TODO: move the manpage generation here (from sys-devel/llvm) +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' utils/lit +} + python_test() { ./lit.py -sv tests || die } diff --git a/dev-python/lit/lit-9999.ebuild b/dev-python/lit/lit-9999.ebuild index 063e1421607b..d8c140474d8d 100644 --- a/dev-python/lit/lit-9999.ebuild +++ b/dev-python/lit/lit-9999.ebuild @@ -28,6 +28,11 @@ DEPEND=" # TODO: move the manpage generation here (from sys-devel/llvm) +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' utils/lit +} + python_test() { ./lit.py -vv tests || die } diff --git a/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch new file mode 100644 index 000000000000..be18433be209 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch @@ -0,0 +1,69 @@ +From d813c66bfcfac1837814ec4d174d0389172f0d4c Mon Sep 17 00:00:00 2001 +From: Thiago Macieira <thiago.macieira@intel.com> +Date: Tue, 25 Apr 2017 12:02:09 -0300 +Subject: Fix the build when AVX2 is enabled but __F16C__ isn't defined + +If -mavx2 is used, __AVX2__ is defined, which enables the F16C code +after commit 280e321e52fd4e86545f3f0d4bd4e047786a897e, but that was +wrong since we aren't allowed to use the F16C intrinsics with either +Clang or GCC (we can only do that with GCC 4.9 and Clang 4.8, and only +with an __attribute__ decoration). + +With ICC and MSVC, we are allowed to use the intrinsics, but the +#include was missing. + +[ChangeLog][QtCore] Fixed a compilation issue with qfloat16 if AVX2 +support is enabled in the compiler. Since all processors that support +AVX2 also support F16C, for GCC and Clang it is recommended to either +add -mf16c to your build or to use the corresponding -march= switch. + +Task-number: QTBUG-64529 +Change-Id: I84e363d735b443cb9beefffd14b8ac1fd4baa978 +Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> +--- + src/corelib/global/qfloat16.h | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h +index 89a62a93db..a0aa9496b4 100644 +--- a/src/corelib/global/qfloat16.h ++++ b/src/corelib/global/qfloat16.h +@@ -44,7 +44,16 @@ + #include <QtCore/qmetatype.h> + #include <string.h> + +-#if defined __F16C__ ++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__) ++// All processors that support AVX2 do support F16C too. That doesn't mean ++// we're allowed to use the intrinsics directly, so we'll do it only for ++// the Intel and Microsoft's compilers. ++# if defined(Q_CC_INTEL) || defined(Q_CC_MSVC) ++# define __F16C__ 1 ++# endif ++#endif ++ ++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) + #include <immintrin.h> + #endif + +@@ -116,7 +125,7 @@ QT_WARNING_DISABLE_CLANG("-Wc99-extensions") + QT_WARNING_DISABLE_GCC("-Wold-style-cast") + inline qfloat16::qfloat16(float f) Q_DECL_NOTHROW + { +-#if defined(QT_COMPILER_SUPPORTS_F16C) && (defined(__F16C__) || defined(__AVX2__)) ++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) + __m128 packsingle = _mm_set_ss(f); + __m128i packhalf = _mm_cvtps_ph(packsingle, 0); + b16 = _mm_extract_epi16(packhalf, 0); +@@ -134,7 +143,7 @@ QT_WARNING_POP + + inline qfloat16::operator float() const Q_DECL_NOTHROW + { +-#if defined(QT_COMPILER_SUPPORTS_F16C) && (defined(__F16C__) || defined(__AVX2__)) ++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) + __m128i packhalf = _mm_cvtsi32_si128(b16); + __m128 packsingle = _mm_cvtph_ps(packhalf); + return _mm_cvtss_f32(packsingle); +-- +cgit v1.1-6-g87c4 + diff --git a/dev-qt/qtcore/qtcore-5.9.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild index 779bc30c7b90..5442d7c47bf9 100644 --- a/dev-qt/qtcore/qtcore-5.9.3.ebuild +++ b/dev-qt/qtcore/qtcore-5.9.3.ebuild @@ -24,6 +24,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-avx.patch" ) + QT5_TARGET_SUBDIRS=( src/tools/bootstrap src/tools/moc diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild index ba128d2eddbc..2c0bd6388d55 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild @@ -65,6 +65,7 @@ RDEPEND=" " DEPEND="${RDEPEND} ${PYTHON_DEPS} + >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild index ba128d2eddbc..2c0bd6388d55 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild @@ -65,6 +65,7 @@ RDEPEND=" " DEPEND="${RDEPEND} ${PYTHON_DEPS} + >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c diff --git a/dev-util/lldb/lldb-5.0.9999.ebuild b/dev-util/lldb/lldb-5.0.9999.ebuild index d1d0b573437b..d6bf9c6540ef 100644 --- a/dev-util/lldb/lldb-5.0.9999.ebuild +++ b/dev-util/lldb/lldb-5.0.9999.ebuild @@ -57,7 +57,7 @@ src_unpack() { if use test; then git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm + "${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest fi git-r3_checkout } diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild index 143975f66c9a..8befa71e1b0e 100644 --- a/dev-util/lldb/lldb-9999.ebuild +++ b/dev-util/lldb/lldb-9999.ebuild @@ -56,7 +56,7 @@ src_unpack() { if use test; then git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm + "${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest fi git-r3_checkout } diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass index c9d2731a64fe..55a987b79545 100644 --- a/eclass/git-r3.eclass +++ b/eclass/git-r3.eclass @@ -553,6 +553,7 @@ _git-r3_is_local_repo() { git-r3_fetch() { debug-print-function ${FUNCNAME} "$@" + # process repos first since we create repo_name from it local repos if [[ ${1} ]]; then repos=( ${1} ) @@ -562,12 +563,6 @@ git-r3_fetch() { repos=( ${EGIT_REPO_URI} ) fi - local branch=${EGIT_BRANCH:+refs/heads/${EGIT_BRANCH}} - local remote_ref=${2:-${EGIT_COMMIT:-${branch:-HEAD}}} - local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}} - local local_ref=refs/git-r3/${local_id}/__main__ - local commit_date=${4:-${EGIT_COMMIT_DATE}} - [[ ${repos[@]} ]] || die "No URI provided and EGIT_REPO_URI unset" local r @@ -591,6 +586,54 @@ git-r3_fetch() { ) fi + # get the default values for the common variables and override them + local branch_name=${EGIT_BRANCH} + local commit_id=${2:-${EGIT_COMMIT}} + local commit_date=${4:-${EGIT_COMMIT_DATE}} + + # support new override API for EAPI 6+ + if ! has "${EAPI:-0}" 0 1 2 3 4 5; then + # get the name and do some more processing: + # 1) kill .git suffix, + # 2) underscore (remaining) non-variable characters, + # 3) add preceding underscore if it starts with a digit, + # 4) uppercase. + local override_name=${GIT_DIR##*/} + override_name=${override_name%.git} + override_name=${override_name//[^a-zA-Z0-9_]/_} + override_name=${override_name^^} + + local varmap=( + REPO:repos + BRANCH:branch_name + COMMIT:commit_id + COMMIT_DATE:commit_date + ) + + local localvar livevar live_warn= + for localvar in "${varmap[@]}"; do + livevar=EGIT_OVERRIDE_${localvar%:*}_${override_name} + localvar=${localvar#*:} + + if [[ -n ${!livevar} ]]; then + [[ ${localvar} == repos ]] && repos=() + live_warn=1 + ewarn "Using ${livevar}=${!livevar}" + declare "${localvar}=${!livevar}" + fi + done + + if [[ ${live_warn} ]]; then + ewarn "No support will be provided." + fi + fi + + # set final variables after applying overrides + local branch=${branch_name:+refs/heads/${branch_name}} + local remote_ref=${commit_id:-${branch:-HEAD}} + local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}} + local local_ref=refs/git-r3/${local_id}/__main__ + # try to fetch from the remote local success saved_umask if [[ ${EVCS_UMASK} ]]; then @@ -803,7 +846,7 @@ git-r3_fetch() { } # @FUNCTION: git-r3_checkout -# @USAGE: [<repo-uri> [<checkout-path> [<local-id>]]] +# @USAGE: [<repo-uri> [<checkout-path> [<local-id> [<checkout-paths>...]]]] # @DESCRIPTION: # Check the previously fetched tree to the working copy. # @@ -819,6 +862,12 @@ git-r3_fetch() { # <local-id> needs to specify the local identifier that was used # for respective git-r3_fetch. # +# If <checkout-paths> are specified, then the specified paths are passed +# to 'git checkout' to effect a partial checkout. Please note that such +# checkout will not cause the repository to switch branches, +# and submodules will be skipped at the moment. The submodules matching +# those paths might be checked out in a future version of the eclass. +# # The checkout operation will write to the working copy, and export # the repository state into the environment. If the repository contains # submodules, they will be checked out recursively. @@ -836,6 +885,7 @@ git-r3_checkout() { local out_dir=${2:-${EGIT_CHECKOUT_DIR:-${WORKDIR}/${P}}} local local_id=${3:-${CATEGORY}/${PN}/${SLOT%/*}} + local checkout_paths=( "${@:4}" ) local -x GIT_DIR _git-r3_set_gitdir "${repos[0]}" @@ -883,6 +933,9 @@ git-r3_checkout() { else set -- "${@}" "${new_commit_id}" fi + if [[ ${checkout_paths[@]} ]]; then + set -- "${@}" -- "${checkout_paths[@]}" + fi echo "${@}" >&2 "${@}" || die "git checkout ${remote_ref:-${new_commit_id}} failed" } @@ -905,8 +958,12 @@ git-r3_checkout() { echo " updating from commit: ${old_commit_id}" echo " to commit: ${new_commit_id}" - git --no-pager diff --stat \ + set -- git --no-pager diff --stat \ ${old_commit_id}..${new_commit_id} + if [[ ${checkout_paths[@]} ]]; then + set -- "${@}" -- "${checkout_paths[@]}" + fi + "${@}" else echo " at the commit: ${new_commit_id}" fi @@ -914,7 +971,7 @@ git-r3_checkout() { git update-ref --no-deref refs/git-r3/"${local_id}"/{__old__,__main__} || die # recursively checkout submodules - if [[ -f ${out_dir}/.gitmodules ]]; then + if [[ -f ${out_dir}/.gitmodules && ! ${checkout_paths} ]]; then local submodules _git-r3_set_submodules \ "$(<"${out_dir}"/.gitmodules)" diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest index 3dcadc08908e..78d1fe1e8d0f 100644 --- a/sys-cluster/glusterfs/Manifest +++ b/sys-cluster/glusterfs/Manifest @@ -1,2 +1 @@ DIST glusterfs-3.12.3.tar.gz 7187644 BLAKE2B 736c6bb408b0bd289ce5ce0abcc7e8bf4b7f96e4e92a1e669f016b59fb16993b17f7cf50fed09a6eeb851b57054c7bf9e595b642c506b0aca567d7ae80de0e84 SHA512 f648b8324a69360b510c947e49918467c969dcc21b6a408b6916b780aa78c44abe027b6c84d696eed7d5f381b055edd3be1dfe4f3ea8f76d15d9319cd08cfa3d -DIST glusterfs-3.6.5.tar.gz 6091408 SHA256 20d912ef35fb8350c50c39c15134a3558ee90d012203f049799c8eb67a61fd2a SHA512 7ca41855239818fc4c84cdb86e1f1d39502e781d5117a5ee50ea134f03f0823a8640ee9bda28f05463e8504aba9ddb12ac72e118f0ce7c3755c083033f5677ca WHIRLPOOL 9fc0592052d976d65fcc769c69d910fa6d909695162bccf80c1e799a2c54c531ab03a4afd3788951c231a214a22e5f8bb3613a83277858627425b86fd532ab5e diff --git a/sys-cluster/glusterfs/files/glusterd-r2.initd b/sys-cluster/glusterfs/files/glusterd-r2.initd deleted file mode 100644 index 924939400f30..000000000000 --- a/sys-cluster/glusterfs/files/glusterd-r2.initd +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -description="Gluster elastic volume management daemon" -command="/usr/sbin/glusterd" -pidfile="/var/run/${SVCNAME}.pid" -command_args="-N" - -command_background="yes" - -depend() { - need net - before netmount -} - -start_pre() { - # Ensure that the GlusterFS auxiliary mount parent directory exists - checkpath --directory --owner root:root --mode 0700 /var/run/gluster -} - -start_post() { - local c=0 - ebegin "Waiting for glusterd to start up" - while ! /usr/sbin/gluster volume list &>/dev/null && [ "${c}" -lt "${glusterd_max_wait_start-60}" ]; do - (( ++c )) - done - [ "${c}" -lt "${glusterd_max_wait_start-60}" ] - eend $? - - return 0 -} diff --git a/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch b/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch deleted file mode 100644 index 1b79e0d079e4..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.4.0-silent_rules.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- configure.ac 2013-07-12 19:43:26.000000000 +0200 -+++ configure.ac2 2013-07-25 13:58:48.294091861 +0200 -@@ -10,20 +10,6 @@ - - AM_INIT_AUTOMAKE - --m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)]) -- --if make --help 2>&1 | grep -q no-print-directory; then -- AM_MAKEFLAGS="$AM_MAKEFLAGS --no-print-directory"; --fi -- --if make --help 2>&1 | grep -q quiet; then -- AM_MAKEFLAGS="$AM_MAKEFLAGS --quiet" --fi -- --if libtool --help 2>&1 | grep -q quiet; then -- AM_LIBTOOLFLAGS="--quiet"; --fi -- - AC_CONFIG_HEADERS([config.h]) - - AC_CONFIG_FILES([Makefile diff --git a/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch b/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch deleted file mode 100644 index 5c4df0c97025..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8bfe3752c3a0a4db49a879048cdd089da6c45ed0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tiziano=20M=C3=BCller?= <tm@dev-zero.ch> -Date: Thu, 26 Jun 2014 19:04:54 +0200 -Subject: [PATCH] Add libraries using LIBADD instead of LDFLAGS - ---- - xlators/encryption/crypt/src/Makefile.am | 6 +++--- - xlators/features/compress/src/Makefile.am | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am -index b13f650..d7ebac6 100644 ---- a/xlators/encryption/crypt/src/Makefile.am -+++ b/xlators/encryption/crypt/src/Makefile.am -@@ -3,10 +3,10 @@ if ENABLE_CRYPT_XLATOR - xlator_LTLIBRARIES = crypt.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption - --crypt_la_LDFLAGS = -module -avoid-version -lssl -lcrypto -+crypt_la_LDFLAGS = -module -avoid-version - - crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c --crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -+crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto - - noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h - -@@ -21,4 +21,4 @@ else - noinst_DIST = keys.c data.c metadata.c atom.c crypt.c - noinst_HEADERS = crypt-common.h crypt-mem-types.h crypt.h metadata.h - --endif -\ No newline at end of file -+endif -diff --git a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am -index 0bf757c..d3abe03 100644 ---- a/xlators/features/compress/src/Makefile.am -+++ b/xlators/features/compress/src/Makefile.am -@@ -4,10 +4,10 @@ xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - - noinst_HEADERS = cdc.h cdc-mem-types.h - --cdc_la_LDFLAGS = -module -avoid-version $(LIBZ_LIBS) -+cdc_la_LDFLAGS = -module -avoid-version - - cdc_la_SOURCES = cdc.c cdc-helper.c --cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -+cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS) - - AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) \ - -shared -nostartfiles $(LIBZ_CFLAGS) --- -1.9.2 - diff --git a/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch b/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch deleted file mode 100644 index af5332bc9b1e..000000000000 --- a/sys-cluster/glusterfs/files/glusterfs-3.6.5-build-shared-only.patch +++ /dev/null @@ -1,547 +0,0 @@ -diff -ur a/rpc/rpc-transport/rdma/src/Makefile.am b/rpc/rpc-transport/rdma/src/Makefile.am ---- a/rpc/rpc-transport/rdma/src/Makefile.am 2015-08-28 10:56:17.750192744 +0200 -+++ b/rpc/rpc-transport/rdma/src/Makefile.am 2015-08-28 11:00:36.322686236 +0200 -@@ -3,7 +3,7 @@ - transport_LTLIBRARIES = rdma.la - transportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport - --rdma_la_LDFLAGS = -module -avoid-version -nostartfiles -+rdma_la_LDFLAGS = -module -avoid-version -nostartfiles -shared - - rdma_la_SOURCES = rdma.c name.c - rdma_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ -Only in b/rpc/rpc-transport/rdma/src: Makefile.am.orig -Only in b/rpc/rpc-transport/rdma/src: Makefile.am.rej -diff -ur a/rpc/rpc-transport/socket/src/Makefile.am b/rpc/rpc-transport/socket/src/Makefile.am ---- a/rpc/rpc-transport/socket/src/Makefile.am 2015-08-28 10:56:17.750192744 +0200 -+++ b/rpc/rpc-transport/socket/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -3,7 +3,7 @@ - rpctransport_LTLIBRARIES = socket.la - rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport - --socket_la_LDFLAGS = -module -avoid-version -+socket_la_LDFLAGS = -module -avoid-version -shared - - socket_la_SOURCES = socket.c name.c - socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -diff -ur a/xlators/cluster/afr/src/Makefile.am b/xlators/cluster/afr/src/Makefile.am ---- a/xlators/cluster/afr/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 -+++ b/xlators/cluster/afr/src/Makefile.am 2015-08-28 11:01:31.603219323 +0200 -@@ -10,11 +10,11 @@ - afr-self-heal-entry.c afr-self-heal-metadata.c afr-self-heald.c \ - afr-self-heal-name.c - --afr_la_LDFLAGS = -module -avoid-version -+afr_la_LDFLAGS = -module -avoid-version -shared - afr_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) afr.c - afr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --pump_la_LDFLAGS = -module -avoid-version -+pump_la_LDFLAGS = -module -avoid-version -shared - pump_la_SOURCES = $(afr_common_source) $(AFR_SELFHEAL_SOURCES) pump.c - pump_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - -Only in b/xlators/cluster/afr/src: Makefile.am.orig -Only in b/xlators/cluster/afr/src: Makefile.am.rej -diff -ur a/xlators/cluster/dht/src/Makefile.am b/xlators/cluster/dht/src/Makefile.am ---- a/xlators/cluster/dht/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 -+++ b/xlators/cluster/dht/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -11,13 +11,13 @@ - nufa_la_SOURCES = $(dht_common_source) nufa.c - switch_la_SOURCES = $(dht_common_source) switch.c - --dht_la_LDFLAGS = -module -avoid-version -+dht_la_LDFLAGS = -module -avoid-version -shared - dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --nufa_la_LDFLAGS = -module -avoid-version -+nufa_la_LDFLAGS = -module -avoid-version -shared - nufa_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --switch_la_LDFLAGS = -module -avoid-version -+switch_la_LDFLAGS = -module -avoid-version -shared - switch_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - - noinst_HEADERS = dht-common.h dht-mem-types.h dht-messages.h dht-helper.h \ -Only in b/xlators/cluster/dht/src: Makefile.am.orig -diff -ur a/xlators/cluster/stripe/src/Makefile.am b/xlators/cluster/stripe/src/Makefile.am ---- a/xlators/cluster/stripe/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 -+++ b/xlators/cluster/stripe/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = stripe.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster - --stripe_la_LDFLAGS = -module -avoid-version -+stripe_la_LDFLAGS = -module -avoid-version -shared - - stripe_la_SOURCES = stripe.c stripe-helpers.c \ - $(top_builddir)/xlators/lib/src/libxlator.c -Only in b/xlators/cluster/stripe/src: Makefile.am.orig -diff -ur a/xlators/debug/error-gen/src/Makefile.am b/xlators/debug/error-gen/src/Makefile.am ---- a/xlators/debug/error-gen/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 -+++ b/xlators/debug/error-gen/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = error-gen.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug - --error_gen_la_LDFLAGS = -module -avoid-version -+error_gen_la_LDFLAGS = -module -avoid-version -shared - - error_gen_la_SOURCES = error-gen.c - error_gen_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/debug/io-stats/src/Makefile.am b/xlators/debug/io-stats/src/Makefile.am ---- a/xlators/debug/io-stats/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 -+++ b/xlators/debug/io-stats/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = io-stats.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug - --io_stats_la_LDFLAGS = -module -avoid-version -+io_stats_la_LDFLAGS = -module -avoid-version -shared - - io_stats_la_SOURCES = io-stats.c - io_stats_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/debug/trace/src/Makefile.am b/xlators/debug/trace/src/Makefile.am ---- a/xlators/debug/trace/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 -+++ b/xlators/debug/trace/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = trace.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/debug - --trace_la_LDFLAGS = -module -avoid-version -+trace_la_LDFLAGS = -module -avoid-version -shared - - trace_la_SOURCES = trace.c - trace_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am ---- a/xlators/encryption/crypt/src/Makefile.am 2015-08-28 11:18:28.073021439 +0200 -+++ b/xlators/encryption/crypt/src/Makefile.am 2015-08-28 11:16:28.051864039 +0200 -@@ -3,7 +3,7 @@ - xlator_LTLIBRARIES = crypt.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption - --crypt_la_LDFLAGS = -module -avoid-version -+crypt_la_LDFLAGS = -module -avoid-version -shared - - crypt_la_SOURCES = keys.c data.c metadata.c atom.c crypt.c - crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl -lcrypto -Only in b/xlators/encryption/crypt/src: Makefile.am.orig -Only in b/xlators/encryption/crypt/src: Makefile.am.rej -diff -ur a/xlators/encryption/rot-13/src/Makefile.am b/xlators/encryption/rot-13/src/Makefile.am ---- a/xlators/encryption/rot-13/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 -+++ b/xlators/encryption/rot-13/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = rot-13.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption - --rot_13_la_LDFLAGS = -module -avoid-version -+rot_13_la_LDFLAGS = -module -avoid-version -shared - - rot_13_la_SOURCES = rot-13.c - rot_13_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/features/changelog/src/Makefile.am b/xlators/features/changelog/src/Makefile.am ---- a/xlators/features/changelog/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/changelog/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -5,7 +5,7 @@ - noinst_HEADERS = changelog-helpers.h changelog-mem-types.h changelog-rt.h \ - changelog-misc.h changelog-encoders.h changelog-notifier.h - --changelog_la_LDFLAGS = -module -avoid-version -+changelog_la_LDFLAGS = -module -avoid-version -shared - - changelog_la_SOURCES = changelog.c changelog-rt.c changelog-helpers.c \ - changelog-encoders.c changelog-notifier.c changelog-barrier.c -Only in b/xlators/features/changelog/src: Makefile.am.orig -diff -ur a/xlators/features/compress/src/Makefile.am b/xlators/features/compress/src/Makefile.am ---- a/xlators/features/compress/src/Makefile.am 2015-08-28 11:18:28.073021439 +0200 -+++ b/xlators/features/compress/src/Makefile.am 2015-08-28 11:17:19.492360095 +0200 -@@ -4,7 +4,7 @@ - - noinst_HEADERS = cdc.h cdc-mem-types.h - --cdc_la_LDFLAGS = -module -avoid-version -+cdc_la_LDFLAGS = -module -avoid-version -shared - - cdc_la_SOURCES = cdc.c cdc-helper.c - cdc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBZ_LIBS) -Only in b/xlators/features/compress/src: Makefile.am.rej -diff -ur a/xlators/features/gfid-access/src/Makefile.am b/xlators/features/gfid-access/src/Makefile.am ---- a/xlators/features/gfid-access/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/gfid-access/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = gfid-access.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --gfid_access_la_LDFLAGS = -module -avoid-version -+gfid_access_la_LDFLAGS = -module -avoid-version -shared - - gfid_access_la_SOURCES = gfid-access.c - gfid_access_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/features/index/src/Makefile.am b/xlators/features/index/src/Makefile.am ---- a/xlators/features/index/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/index/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = index.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --index_la_LDFLAGS = -module -avoid-version -+index_la_LDFLAGS = -module -avoid-version -shared - - index_la_SOURCES = index.c - index_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/features/locks/src/Makefile.am b/xlators/features/locks/src/Makefile.am ---- a/xlators/features/locks/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/locks/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = locks.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --locks_la_LDFLAGS = -module -avoid-version -+locks_la_LDFLAGS = -module -avoid-version -shared - - locks_la_SOURCES = common.c posix.c entrylk.c inodelk.c reservelk.c \ - clear.c -diff -ur a/xlators/features/mac-compat/src/Makefile.am b/xlators/features/mac-compat/src/Makefile.am ---- a/xlators/features/mac-compat/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/mac-compat/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = mac-compat.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --mac_compat_la_LDFLAGS = -module -avoid-version -+mac_compat_la_LDFLAGS = -module -avoid-version -shared - - mac_compat_la_SOURCES = mac-compat.c - mac_compat_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/features/marker/src/Makefile.am b/xlators/features/marker/src/Makefile.am ---- a/xlators/features/marker/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/marker/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = marker.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --marker_la_LDFLAGS = -module -avoid-version -+marker_la_LDFLAGS = -module -avoid-version -shared - - marker_la_SOURCES = marker.c marker-quota.c marker-quota-helper.c marker-common.c - marker_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/features/protect/src/Makefile.am b/xlators/features/protect/src/Makefile.am ---- a/xlators/features/protect/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/protect/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -2,15 +2,15 @@ - - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --prot_dht_la_LDFLAGS = -module -avoid-version -+prot_dht_la_LDFLAGS = -module -avoid-version -shared - prot_dht_la_SOURCES = prot_dht.c - prot_dht_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --prot_client_la_LDFLAGS = -module -avoid-version -+prot_client_la_LDFLAGS = -module -avoid-version -shared - prot_client_la_SOURCES = prot_client.c - prot_client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --prot_server_la_LDFLAGS = -module -avoid-version -+prot_server_la_LDFLAGS = -module -avoid-version -shared - prot_server_la_SOURCES = prot_server.c - prot_server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - -diff -ur a/xlators/features/qemu-block/src/Makefile.am b/xlators/features/qemu-block/src/Makefile.am ---- a/xlators/features/qemu-block/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/qemu-block/src/Makefile.am 2015-08-28 11:03:19.464259458 +0200 -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = qemu-block.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --qemu_block_la_LDFLAGS = -module -avoid-version -+qemu_block_la_LDFLAGS = -module -avoid-version -shared - qemu_block_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GLIB_LIBS) $(ZLIB_LIBS) -lrt - - qemu_block_la_SOURCES_qemu = \ -Only in b/xlators/features/qemu-block/src: Makefile.am.orig -Only in b/xlators/features/qemu-block/src: Makefile.am.rej -diff -ur a/xlators/features/quiesce/src/Makefile.am b/xlators/features/quiesce/src/Makefile.am ---- a/xlators/features/quiesce/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/quiesce/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = quiesce.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --quiesce_la_LDFLAGS = -module -avoid-version -+quiesce_la_LDFLAGS = -module -avoid-version -shared - - quiesce_la_SOURCES = quiesce.c - quiesce_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/features/quota/src/Makefile.am b/xlators/features/quota/src/Makefile.am ---- a/xlators/features/quota/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/quota/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,8 +1,8 @@ - xlator_LTLIBRARIES = quota.la quotad.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/features - --quota_la_LDFLAGS = -module -avoid-version --quotad_la_LDFLAGS = -module -avoid-version -+quota_la_LDFLAGS = -module -avoid-version -shared -+quotad_la_LDFLAGS = -module -avoid-version -shared - - quota_la_SOURCES = quota.c quota-enforcer-client.c - quota_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/features/read-only/src/Makefile.am b/xlators/features/read-only/src/Makefile.am ---- a/xlators/features/read-only/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/features/read-only/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -4,12 +4,12 @@ - - noinst_HEADERS = read-only-common.h - --read_only_la_LDFLAGS = -module -avoid-version -+read_only_la_LDFLAGS = -module -avoid-version -shared - - read_only_la_SOURCES = read-only.c read-only-common.c - read_only_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - --worm_la_LDFLAGS = -module -avoid-version -+worm_la_LDFLAGS = -module -avoid-version -shared - - worm_la_SOURCES = read-only-common.c worm.c - worm_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/mgmt/glusterd/src/Makefile.am b/xlators/mgmt/glusterd/src/Makefile.am ---- a/xlators/mgmt/glusterd/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/mgmt/glusterd/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = glusterd.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/mgmt - glusterd_la_CPPFLAGS = $(AM_CPPFLAGS) "-DFILTERDIR=\"$(libdir)/glusterfs/$(PACKAGE_VERSION)/filter\"" --glusterd_la_LDFLAGS = -module -avoid-version -+glusterd_la_LDFLAGS = -module -avoid-version -shared - if ENABLE_BD_XLATOR - glusterd_la_LDFLAGS += -llvm2app - endif -diff -ur a/xlators/mount/fuse/src/Makefile.am b/xlators/mount/fuse/src/Makefile.am ---- a/xlators/mount/fuse/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 -+++ b/xlators/mount/fuse/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -26,7 +26,7 @@ - fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \ - $(CONTRIBDIR)/fuse-lib/misc.c $(mount_source) - --fuse_la_LDFLAGS = -module -avoid-version -+fuse_la_LDFLAGS = -module -avoid-version -shared - fuse_la_LIBADD = @GF_FUSE_LDADD@ - - AM_CPPFLAGS = $(GF_CPPFLAGS) \ -Only in b/xlators/mount/fuse/src: Makefile.am.orig -diff -ur a/xlators/nfs/server/src/Makefile.am b/xlators/nfs/server/src/Makefile.am ---- a/xlators/nfs/server/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 -+++ b/xlators/nfs/server/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = server.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/nfs - nfsrpclibdir = $(top_srcdir)/rpc/rpc-lib/src --server_la_LDFLAGS = -module -avoid-version -+server_la_LDFLAGS = -module -avoid-version -shared - server_la_SOURCES = nfs.c nfs-common.c nfs-fops.c nfs-inodes.c \ - nfs-generics.c mount3.c nfs3-fh.c nfs3.c nfs3-helpers.c nlm4.c \ - nlmcbk_svc.c mount3udp_svc.c acl3.c -diff -ur a/xlators/performance/io-cache/src/Makefile.am b/xlators/performance/io-cache/src/Makefile.am ---- a/xlators/performance/io-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/performance/io-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = io-cache.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --io_cache_la_LDFLAGS = -module -avoid-version -+io_cache_la_LDFLAGS = -module -avoid-version -shared - - io_cache_la_SOURCES = io-cache.c page.c ioc-inode.c - io_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/performance/io-threads/src/Makefile.am b/xlators/performance/io-threads/src/Makefile.am ---- a/xlators/performance/io-threads/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/performance/io-threads/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = io-threads.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --io_threads_la_LDFLAGS = -module -avoid-version -+io_threads_la_LDFLAGS = -module -avoid-version -shared - - io_threads_la_SOURCES = io-threads.c - io_threads_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/performance/md-cache/src/Makefile.am b/xlators/performance/md-cache/src/Makefile.am ---- a/xlators/performance/md-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/performance/md-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = md-cache.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --md_cache_la_LDFLAGS = -module -avoid-version -+md_cache_la_LDFLAGS = -module -avoid-version -shared - - md_cache_la_SOURCES = md-cache.c - md_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/performance/open-behind/src/Makefile.am b/xlators/performance/open-behind/src/Makefile.am ---- a/xlators/performance/open-behind/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/performance/open-behind/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = open-behind.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --open_behind_la_LDFLAGS = -module -avoid-version -+open_behind_la_LDFLAGS = -module -avoid-version -shared - - open_behind_la_SOURCES = open-behind.c - open_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/performance/quick-read/src/Makefile.am b/xlators/performance/quick-read/src/Makefile.am ---- a/xlators/performance/quick-read/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/performance/quick-read/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = quick-read.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --quick_read_la_LDFLAGS = -module -avoid-version -+quick_read_la_LDFLAGS = -module -avoid-version -shared - - quick_read_la_SOURCES = quick-read.c - quick_read_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/performance/read-ahead/src/Makefile.am b/xlators/performance/read-ahead/src/Makefile.am ---- a/xlators/performance/read-ahead/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 -+++ b/xlators/performance/read-ahead/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = read-ahead.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --read_ahead_la_LDFLAGS = -module -avoid-version -+read_ahead_la_LDFLAGS = -module -avoid-version -shared - - read_ahead_la_SOURCES = read-ahead.c page.c - read_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/performance/readdir-ahead/src/Makefile.am b/xlators/performance/readdir-ahead/src/Makefile.am ---- a/xlators/performance/readdir-ahead/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/performance/readdir-ahead/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = readdir-ahead.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --readdir_ahead_la_LDFLAGS = -module -avoid-version -+readdir_ahead_la_LDFLAGS = -module -avoid-version -shared - - readdir_ahead_la_SOURCES = readdir-ahead.c - readdir_ahead_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/performance/symlink-cache/src/Makefile.am b/xlators/performance/symlink-cache/src/Makefile.am ---- a/xlators/performance/symlink-cache/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/performance/symlink-cache/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = symlink-cache.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/performance - --symlink_cache_la_LDFLAGS = -module -avoid-version -+symlink_cache_la_LDFLAGS = -module -avoid-version -shared - - symlink_cache_la_SOURCES = symlink-cache.c - symlink_cache_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/performance/write-behind/src/Makefile.am b/xlators/performance/write-behind/src/Makefile.am ---- a/xlators/performance/write-behind/src/Makefile.am 2015-08-28 10:56:17.730192551 +0200 -+++ b/xlators/performance/write-behind/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = write-behind.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/performance - --write_behind_la_LDFLAGS = -module -avoid-version -+write_behind_la_LDFLAGS = -module -avoid-version -shared - - write_behind_la_SOURCES = write-behind.c - write_behind_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/playground/template/src/Makefile.am b/xlators/playground/template/src/Makefile.am ---- a/xlators/playground/template/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 -+++ b/xlators/playground/template/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = template.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/testing/features - --template_la_LDFLAGS = -module -avoid-version -+template_la_LDFLAGS = -module -avoid-version -shared - - template_la_SOURCES = template.c - template_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/protocol/auth/addr/src/Makefile.am b/xlators/protocol/auth/addr/src/Makefile.am ---- a/xlators/protocol/auth/addr/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 -+++ b/xlators/protocol/auth/addr/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - auth_LTLIBRARIES = addr.la - authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth - --addr_la_LDFLAGS = -module -avoid-version -+addr_la_LDFLAGS = -module -avoid-version -shared - - addr_la_SOURCES = addr.c - addr_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/protocol/auth/login/src/Makefile.am b/xlators/protocol/auth/login/src/Makefile.am ---- a/xlators/protocol/auth/login/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 -+++ b/xlators/protocol/auth/login/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - auth_LTLIBRARIES = login.la - authdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/auth - --login_la_LDFLAGS = -module -avoid-version -+login_la_LDFLAGS = -module -avoid-version -shared - - login_la_SOURCES = login.c - login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -diff -ur a/xlators/protocol/client/src/Makefile.am b/xlators/protocol/client/src/Makefile.am ---- a/xlators/protocol/client/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 -+++ b/xlators/protocol/client/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = client.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol - --client_la_LDFLAGS = -module -avoid-version -+client_la_LDFLAGS = -module -avoid-version -shared - - client_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ -diff -ur a/xlators/protocol/server/src/Makefile.am b/xlators/protocol/server/src/Makefile.am ---- a/xlators/protocol/server/src/Makefile.am 2015-08-28 10:56:17.740192649 +0200 -+++ b/xlators/protocol/server/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,7 +1,7 @@ - xlator_LTLIBRARIES = server.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/protocol - --server_la_LDFLAGS = -module -avoid-version -+server_la_LDFLAGS = -module -avoid-version -shared - - server_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \ - $(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \ -diff -ur a/xlators/storage/bd/src/Makefile.am b/xlators/storage/bd/src/Makefile.am ---- a/xlators/storage/bd/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 -+++ b/xlators/storage/bd/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = bd.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage - --bd_la_LDFLAGS = -module -avoid-version -+bd_la_LDFLAGS = -module -avoid-version -shared - LIBBD = -llvm2app -lrt - bd_la_SOURCES = bd.c bd-helper.c bd-aio.c - bd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBBD) $(LIBAIO) -diff -ur a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am ---- a/xlators/storage/posix/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 -+++ b/xlators/storage/posix/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -2,7 +2,7 @@ - xlator_LTLIBRARIES = posix.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/storage - --posix_la_LDFLAGS = -module -avoid-version -+posix_la_LDFLAGS = -module -avoid-version -shared - - posix_la_SOURCES = posix.c posix-helpers.c posix-handle.c posix-aio.c - posix_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(LIBAIO) -diff -ur a/xlators/system/posix-acl/src/Makefile.am b/xlators/system/posix-acl/src/Makefile.am ---- a/xlators/system/posix-acl/src/Makefile.am 2015-08-28 10:56:17.720192456 +0200 -+++ b/xlators/system/posix-acl/src/Makefile.am 2015-08-28 10:59:35.752102136 +0200 -@@ -1,6 +1,6 @@ - xlator_LTLIBRARIES = posix-acl.la - xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/system --posix_acl_la_LDFLAGS = -module -avoid-version -+posix_acl_la_LDFLAGS = -module -avoid-version -shared - posix_acl_la_SOURCES = posix-acl.c posix-acl-xattr.c - posix_acl_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - diff --git a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild deleted file mode 100644 index 88fd9cdb3998..000000000000 --- a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -AUTOTOOLS_AUTORECONF=1 - -inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator - -DESCRIPTION="GlusterFS is a powerful network/cluster filesystem" -HOMEPAGE="http://www.gluster.org/" -SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz" - -LICENSE="|| ( GPL-2 LGPL-3+ )" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband qemu-block rsyslog static-libs +syslog systemtap vim-syntax +xml" - -REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} ) - glupy? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND="bd-xlator? ( sys-fs/lvm2 ) - emacs? ( virtual/emacs ) - fuse? ( >=sys-fs/fuse-2.7.0 ) - georeplication? ( ${PYTHON_DEPS} ) - infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) - qemu-block? ( dev-libs/glib:2 ) - systemtap? ( dev-util/systemtap ) - xml? ( dev-libs/libxml2 ) - sys-libs/readline:= - dev-libs/libaio - dev-libs/openssl:= - || ( sys-libs/glibc sys-libs/argp-standalone )" -DEPEND="${RDEPEND} - virtual/pkgconfig - sys-devel/bison - sys-devel/flex" - -SITEFILE="50${PN}-mode-gentoo.el" - -PATCHES=( - "${FILESDIR}/${PN}-3.4.0-silent_rules.patch" - "${FILESDIR}/${PN}-3.5.1-Add-libraries-using-LIBADD-instead-of-LDFLAGS.patch" - "${FILESDIR}/${PN}-3.6.5-build-shared-only.patch" -) - -DOCS=( AUTHORS ChangeLog NEWS README THANKS ) - -# Maintainer notes: -# * The build system will always configure & build argp-standalone but it'll never use it -# if the argp.h header is found in the system. Which should be the case with -# glibc or if argp-standalone is installed. - -pkg_setup() { - ( use georeplication || use glupy ) && python-single-r1_pkg_setup -} - -src_prepare() { - autotools-utils_src_prepare - - # contrib/argp-standalone source dir is not clean... - cd contrib/argp-standalone - emake distclean -} - -src_configure() { - local myeconfargs=( - --disable-dependency-tracking - --disable-silent-rules - --disable-fusermount - $(use_enable debug) - $(use_enable bd-xlator) - $(use_enable crypt-xlator) - $(use_enable fuse fuse-client) - $(use_enable georeplication) - $(use_enable glupy) - $(use_enable infiniband ibverbs) - $(use_enable qemu-block) - $(use_enable static-libs static) - $(use_enable syslog) - $(use_enable systemtap) - $(use_enable xml xml-output) - --docdir=/usr/share/doc/${PF} - --localstatedir=/var - ) - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - - use emacs && elisp-compile extras/glusterfs-mode.el -} - -src_install() { - autotools-utils_src_install - - rm \ - "${D}"/etc/glusterfs/glusterfs-{georep-,}logrotate \ - "${D}"/etc/glusterfs/gluster-rsyslog-*.conf \ - "${D}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed" - - insinto /etc/logrotate.d - newins "${FILESDIR}"/glusterfs.logrotate glusterfs - - if use rsyslog ; then - insinto /etc/rsyslog.d - newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf - fi - - if use emacs ; then - elisp-install ${PN} extras/glusterfs-mode.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - if use vim-syntax ; then - insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim - insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim - fi - - # insert some other tools which might be useful - insinto /usr/share/glusterfs/scripts - doins \ - extras/backend-{cleanup,xattr-sanitize}.sh \ - extras/clear_xattrs.sh \ - extras/migrate-unify-to-distribute.sh - - # correct permissions on installed scripts - # fperms 0755 /usr/share/glusterfs/scripts/*.sh - chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die - - if use georeplication ; then - # move the gsync-sync-gfid tool to a binary path - # and set a symlink to be compliant with all other distros - mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die - dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid - fi - - newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd - newinitd "${FILESDIR}/glusterd-r2.initd" glusterd - newconfd "${FILESDIR}/${PN}.confd" glusterfsd - - keepdir /var/log/${PN} - keepdir /var/lib/glusterd - - # QA - rm -rf "${ED}/var/run/" || die - use static-libs || find "${ED}"/usr/$(get_libdir)/ -type f -name '*.la' -delete - - use georeplication && python_fix_shebang "${ED}" -} - -pkg_postinst() { - elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your" - elog "volumes dynamically. To do so, simply use the gluster CLI after running:" - elog " /etc/init.d/glusterd start" - echo - elog "For static configurations, the glusterfsd startup script can be multiplexed." - elog "The default startup script uses /etc/conf.d/glusterfsd to configure the" - elog "separate service. To create additional instances of the glusterfsd service" - elog "simply create a symlink to the glusterfsd startup script." - echo - elog "Example:" - elog " # ln -s glusterfsd /etc/init.d/glusterfsd2" - elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol" - elog "You can now treat glusterfsd2 like any other service" - echo - ewarn "You need to use a ntp client to keep the clocks synchronized across all" - ewarn "of your servers. Setup a NTP synchronizing service before attempting to" - ewarn "run GlusterFS." - - elog - elog "If you are upgrading from a previous version of ${PN}, please read:" - elog " http://www.gluster.org/community/documentation/index.php/Upgrade_to_3.6" - - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild index 46db8c8117a9..bf4d7407c8ad 100644 --- a/sys-devel/clang/clang-5.0.9999.ebuild +++ b/sys-devel/clang/clang-5.0.9999.ebuild @@ -100,7 +100,7 @@ src_unpack() { "${S}"/tools/extra if use test; then git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm + "${WORKDIR}"/llvm '' utils/{lit,llvm-lit,unittest} fi git-r3_checkout "${EGIT_REPO_URI}" "${S}" } diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index c52113796199..963248a22dde 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-9999.ebuild @@ -96,7 +96,7 @@ src_unpack() { "${S}"/tools/extra if use test; then git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm + "${WORKDIR}"/llvm '' utils/{lit,llvm-lit,unittest} fi git-r3_checkout "${EGIT_REPO_URI}" "${S}" } diff --git a/sys-devel/lld/lld-5.0.9999.ebuild b/sys-devel/lld/lld-5.0.9999.ebuild index c47d7243527e..2524aa428030 100644 --- a/sys-devel/lld/lld-5.0.9999.ebuild +++ b/sys-devel/lld/lld-5.0.9999.ebuild @@ -48,7 +48,7 @@ src_unpack() { if use test; then git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm + "${WORKDIR}"/llvm '' utils/{lit,unittest} fi git-r3_checkout } diff --git a/sys-devel/lld/lld-9999.ebuild b/sys-devel/lld/lld-9999.ebuild index a7b5d23282c8..b01dab04c1a1 100644 --- a/sys-devel/lld/lld-9999.ebuild +++ b/sys-devel/lld/lld-9999.ebuild @@ -47,7 +47,7 @@ src_unpack() { if use test; then git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm + "${WORKDIR}"/llvm '' utils/{lit,unittest} fi git-r3_checkout } diff --git a/sys-devel/llvm-common/llvm-common-5.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-5.0.9999.ebuild index 239d0e083cd5..cc7ed2a71228 100644 --- a/sys-devel/llvm-common/llvm-common-5.0.9999.ebuild +++ b/sys-devel/llvm-common/llvm-common-5.0.9999.ebuild @@ -19,6 +19,11 @@ IUSE="" RDEPEND="!sys-devel/llvm:0" +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' utils/vim +} + src_configure() { :; } src_compile() { :; } src_test() { :; } diff --git a/sys-devel/llvm-common/llvm-common-9999.ebuild b/sys-devel/llvm-common/llvm-common-9999.ebuild index 64d8f5e7daf3..d0f42029fa97 100644 --- a/sys-devel/llvm-common/llvm-common-9999.ebuild +++ b/sys-devel/llvm-common/llvm-common-9999.ebuild @@ -18,6 +18,11 @@ IUSE="" RDEPEND="!sys-devel/llvm:0" +src_unpack() { + git-r3_fetch + git-r3_checkout '' '' '' utils/vim +} + src_configure() { :; } src_compile() { :; } src_test() { :; } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.9999.ebuild index 5118f318acd5..f1c9f6b51d69 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-5.0.9999.ebuild @@ -64,7 +64,7 @@ src_unpack() { if use test; then git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm + "${WORKDIR}"/llvm '' utils/unittest fi git-r3_checkout } diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild index 82ccb7403217..e178f9fc63c5 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-9999.ebuild @@ -63,7 +63,7 @@ src_unpack() { if use test; then git-r3_checkout https://llvm.org/git/llvm.git \ - "${WORKDIR}"/llvm + "${WORKDIR}"/llvm '' utils/unittest fi git-r3_checkout } diff --git a/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild b/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild index 1f5409df9c9d..86fc77c979d0 100644 --- a/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-5.0.9999.ebuild @@ -55,7 +55,7 @@ src_unpack() { git-r3_fetch git-r3_checkout https://llvm.org/git/libcxx.git \ - "${WORKDIR}"/libcxx + "${WORKDIR}"/libcxx '' include git-r3_checkout } diff --git a/sys-libs/libcxxabi/libcxxabi-9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9999.ebuild index c2be84f86a22..572eb0208fea 100644 --- a/sys-libs/libcxxabi/libcxxabi-9999.ebuild +++ b/sys-libs/libcxxabi/libcxxabi-9999.ebuild @@ -54,7 +54,7 @@ src_unpack() { git-r3_fetch git-r3_checkout https://llvm.org/git/libcxx.git \ - "${WORKDIR}"/libcxx + "${WORKDIR}"/libcxx '' include git-r3_checkout } diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest index c58101e210ba..0867e293e55a 100644 --- a/www-apps/grafana-bin/Manifest +++ b/www-apps/grafana-bin/Manifest @@ -1,3 +1,3 @@ -DIST grafana-bin-4.5.2.tar.gz 50374607 SHA256 c438a7ef775dd64e2ebfc72bef1e5a69849f1802b1921f30d6904e8cf05281a6 SHA512 9b650e204f90dfec7ea3ff723a937a3332064c3b5a00bebf3aca4cffe1fdccf83efbe5040c954dc82bc3389a4f5d72f7fa47941f43d022cbdf40e067f9c5adf7 WHIRLPOOL da931ffb2e4a73a77cc64afd3adace46a6043f31455c5bfec9181c0d80aa5191877ffba95d0f77b147ef17f268bb10e3921f7b4304988a08e9b70d87bc40b9c6 -DIST grafana-bin-4.6.0.tar.gz 47177837 SHA256 eac61c02fb39880abac9b2fc0cf6516800ab63a5a98735b5c348a924561e5393 SHA512 bba310b1db360b4621101d02692a19de4a553474271dd6b6b8468c8a2aa938ebb7bc921074f2a8a33545e94fc5a9ec9f6bfdd207e552ae8ba2a2eec127107d37 WHIRLPOOL 168ae3bfbcef9475b4da2d4b45f983d85cd3d1b96efb4a2c6d716e934251b6ec8cdc4311903d3076c2d2305c854f070c19f29c77b8b08a8e700768c4b3f00e07 -DIST grafana-bin-4.6.1.tar.gz 47178005 SHA256 587cb56c76fa8496caf93d4f31ca0b9850a3608f9aa94f439adea1357c36e510 SHA512 f3f49bd2463f0b6426331ecf96a3dc12aa9a24f14aea33390a68a486bcba057057551b7762728deb99a806487508546202874d0119900b1169eec7a41771e18d WHIRLPOOL ea9ded671f641b17232b3c928115206c4322da866e159101ca41ca82fef4fb6da508cf7e2086d1cbd5a2469054620ee8b36924216e6cb6c78002eb89aba815c2 +DIST grafana-bin-4.5.2.tar.gz 50374607 BLAKE2B 0cb4fb5c6b2b465e7cc9ce1f99bf102cd8fc5bc1fad1d995393923e0d6e0e16dd3bd9858b6ad93fc178092e6ef32c1000d4928187d67ab2cdd4f8e9d5a0c71eb SHA512 9b650e204f90dfec7ea3ff723a937a3332064c3b5a00bebf3aca4cffe1fdccf83efbe5040c954dc82bc3389a4f5d72f7fa47941f43d022cbdf40e067f9c5adf7 +DIST grafana-bin-4.6.1.tar.gz 47178005 BLAKE2B ff1dc1e71d310da714828c1b0c9882e42cb5c7061b69bbf60d759a56379e38bc196cf6c0024788f4f92feb9ac54d1e653e5ef354c8de04e976736aec65976357 SHA512 f3f49bd2463f0b6426331ecf96a3dc12aa9a24f14aea33390a68a486bcba057057551b7762728deb99a806487508546202874d0119900b1169eec7a41771e18d +DIST grafana-bin-4.6.2.tar.gz 47182881 BLAKE2B 4235ff77e8d03c3495030acf173c322f0122aaa833188af0338c185f11969cc90c3b8799591a9988290bc6183d6e2bcb92f05d8d5751be1d1bbb807b38ae8ade SHA512 e75f30e8a34e0c0c5e8624fb336be3b8fc0d618f7e20a83451fac68a82195f6f64abfda6215d1d3e9f17cb8af5537c43030e93f0885978de264865ddbebaf86f diff --git a/www-apps/grafana-bin/grafana-bin-4.6.0.ebuild b/www-apps/grafana-bin/grafana-bin-4.6.2.ebuild index 3a8308e2d6d7..3a8308e2d6d7 100644 --- a/www-apps/grafana-bin/grafana-bin-4.6.0.ebuild +++ b/www-apps/grafana-bin/grafana-bin-4.6.2.ebuild |