summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2018-01-01 21:08:01 +0100
committerMichał Górny <mgorny@gentoo.org>2018-01-02 07:18:30 +0100
commit527c80d20b7f94f0812eaf05a6f42d5b0325a46e (patch)
tree34c1540f98bd018c8aeabdf9ec3749f3da1ac17b /app-arch/lz4/files
parentapp-text/fbreader: remove Qt4-based version (diff)
downloadgentoo-527c80d20b7f94f0812eaf05a6f42d5b0325a46e.tar.gz
gentoo-527c80d20b7f94f0812eaf05a6f42d5b0325a46e.tar.bz2
gentoo-527c80d20b7f94f0812eaf05a6f42d5b0325a46e.zip
app-arch/lz4: Clean old up
Diffstat (limited to 'app-arch/lz4/files')
-rw-r--r--app-arch/lz4/files/lz4-0_p106-cflags.patch22
-rw-r--r--app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch51
-rw-r--r--app-arch/lz4/files/lz4-0_p131-static-libs.patch49
3 files changed, 0 insertions, 122 deletions
diff --git a/app-arch/lz4/files/lz4-0_p106-cflags.patch b/app-arch/lz4/files/lz4-0_p106-cflags.patch
deleted file mode 100644
index 6fc0fbb47dd8..000000000000
--- a/app-arch/lz4/files/lz4-0_p106-cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/cmake/pack/CMakeLists.txt
-+++ b/cmake/pack/CMakeLists.txt
-@@ -36,7 +36,7 @@
- ADD_DEFINITIONS("-Wundef")
- ADD_DEFINITIONS("-Wcast-align")
- ADD_DEFINITIONS("-Wno-implicit-function-declaration")
--ADD_DEFINITIONS("-O3 -march=native -std=c99")
-+ADD_DEFINITIONS("-std=c99")
- INCLUDE_DIRECTORIES (${SRC_DIR})
-
-
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -99,7 +99,7 @@
- ADD_DEFINITIONS("-Wundef")
- ADD_DEFINITIONS("-Wcast-align")
- ADD_DEFINITIONS("-Wno-implicit-function-declaration")
--ADD_DEFINITIONS("-Os -march=native -std=c99")
-+ADD_DEFINITIONS("-std=c99")
- INCLUDE_DIRECTORIES (${SRC_DIR})
-
-
diff --git a/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch b/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch
deleted file mode 100644
index 521b1bfc58d2..000000000000
--- a/app-arch/lz4/files/lz4-0_p106-install-to-bindir.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 496c076..ce3fab1 100644
---- a/cmake/CMakeLists.txt
-+++ b/cmake/CMakeLists.txt
-@@ -41,11 +41,11 @@ endif()
- if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
- message(STATUS "Build 64bit executable binary")
- add_executable(lz4c64 ${LZ4_SRCS})
-- install(TARGETS lz4c64 RUNTIME DESTINATION "./")
-+ install(TARGETS lz4c64 RUNTIME DESTINATION "bin/")
- if(NOT BUILD_SHARED_LIBS)
- message(STATUS "Build 32bit executable binary")
- add_executable(lz4c32 ${LZ4_SRCS})
-- install(TARGETS lz4c32 RUNTIME DESTINATION "./")
-+ install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
-
- SET_TARGET_PROPERTIES(lz4c32 PROPERTIES
- COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
-@@ -53,7 +53,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
- else()
- message(STATUS "Build 32bit executable binary")
- add_executable(lz4c32 ${LZ4_SRCS})
-- install(TARGETS lz4c32 RUNTIME DESTINATION "./")
-+ install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
- endif()
-
- if(BUILD_SHARED_LIBS)
-diff --git a/cmake/pack/CMakeLists.txt b/cmake/pack/CMakeLists.txt
-index a9b0557..e85416e 100644
---- a/cmake/pack/CMakeLists.txt
-+++ b/cmake/pack/CMakeLists.txt
-@@ -48,16 +48,16 @@ set(FUZZER_SRCS ${SRC_DIR}lz4.c ${SRC_DIR}lz4hc.c ${SRC_DIR}lz4.h ${SRC_DIR}fuzz
- # EXECUTABLES FOR 32 Bit and 64 versions
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
- add_executable(lz4c32 ${LZ4_SRCS})
-- install(TARGETS lz4c32 RUNTIME DESTINATION "./")
-+ install(TARGETS lz4c32 RUNTIME DESTINATION "bin/")
- SET_TARGET_PROPERTIES(lz4c32 PROPERTIES
- COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32 -Os" LINK_FLAGS "-m32")
- endif()
-
- add_executable(lz4c ${LZ4_SRCS})
--install(TARGETS lz4c RUNTIME DESTINATION "./")
-+install(TARGETS lz4c RUNTIME DESTINATION "bin/")
-
- add_executable(fuzzer ${FUZZER_SRCS})
--install(TARGETS fuzzer RUNTIME DESTINATION "./")
-+install(TARGETS fuzzer RUNTIME DESTINATION "bin/")
-
- #target_link_libraries(lz4 ${LZ4_SRCS_LIB})
- ####################### CPACK PACKAGING ###################
diff --git a/app-arch/lz4/files/lz4-0_p131-static-libs.patch b/app-arch/lz4/files/lz4-0_p131-static-libs.patch
deleted file mode 100644
index f8c5c2de1e83..000000000000
--- a/app-arch/lz4/files/lz4-0_p131-static-libs.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-fix from upstream
-
-From 43b631223b2d0425a0970876974074934f89c450 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 22 Sep 2016 23:59:02 -0400
-Subject: [PATCH] add a flag to disable static libs
-
----
- lib/Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index b5352a0cb372..27b35c41b693 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -40,6 +40,8 @@
- LIBVER_PATCH=`sed -n '/define LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < lz4.h`
- LIBVER=$(LIBVER_MAJOR).$(LIBVER_MINOR).$(LIBVER_PATCH)
-
-+BUILD_STATIC:= yes
-+
- DESTDIR?=
- PREFIX ?= /usr/local
- CFLAGS ?= -O3
-@@ -71,9 +72,11 @@
- all: liblz4
-
- liblz4: lz4.c lz4hc.c lz4frame.c xxhash.c
-+ifeq ($(BUILD_STATIC),yes)
- @echo compiling static library
- @$(CC) $(CPPFLAGS) $(CFLAGS) -c $^
- @$(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o
-+endif
- @echo compiling dynamic library $(LIBVER)
- @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -shared $^ -fPIC $(SONAME_FLAGS) -o $@.$(SHARED_EXT_VER)
- @echo creating versioned links
-@@ -104,7 +107,9 @@
- @cp -a liblz4.$(SHARED_EXT_MAJOR) $(DESTDIR)$(LIBDIR)
- @cp -a liblz4.$(SHARED_EXT) $(DESTDIR)$(LIBDIR)
- @cp -a liblz4.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
-+ifeq ($(BUILD_STATIC),yes)
- @install -m 644 liblz4.a $(DESTDIR)$(LIBDIR)/liblz4.a
-+endif
- @install -m 644 lz4.h $(DESTDIR)$(INCLUDEDIR)/lz4.h
- @install -m 644 lz4hc.h $(DESTDIR)$(INCLUDEDIR)/lz4hc.h
- @install -m 644 lz4frame.h $(DESTDIR)$(INCLUDEDIR)/lz4frame.h
---
-2.9.0
-