Conan/conan-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO-971] ffmpeg recipe with requirements (!9)

Browse Source 
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/9
This commit is contained in:
Aleksandr Vodyanov
2024-12-25 17:47:28 +03:00
parent e58f90de0e
commit 39afe6a1dd
212 changed files with 9263 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
recipes/libcap/all/patches/2.45/0001-Make.Rules-Remove-hardcoded-fPIC.patch Normal file
View File

@@ -0,0 +1,26 @@
From bb2c4e80928e8221a31c3631f5a802c7b022aebd Mon Sep 17 00:00:00 2001
From: Sergey Bobrenok <bobrofon@gmail.com>
Date: Sun, 29 Aug 2021 12:02:23 +0300
Subject: [PATCH 1/2] Make.Rules: Remove hardcoded -fPIC
Signed-off-by: Sergey Bobrenok <bobrofon@gmail.com>
---
Make.Rules | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Make.Rules b/Make.Rules
index cc6f95b..91099c6 100644
--- a/Make.Rules
+++ b/Make.Rules
@@ -52,7 +52,7 @@ GOMAJOR=0
# Compilation specifics
KERNEL_HEADERS := $(topdir)/libcap/include/uapi
-IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+IPATH += -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
CC := $(CROSS_COMPILE)gcc
DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--
2.31.1

36
recipes/libcap/all/patches/2.45/0002-Make.Rules-Make-compile-tools-configurable.patch Normal file
View File

@@ -0,0 +1,36 @@
From 76e637ad20faa811f4091a8a08af4b29c528697b Mon Sep 17 00:00:00 2001
From: Sergey Bobrenok <bobrofon@gmail.com>
Date: Sun, 29 Aug 2021 12:06:18 +0300
Subject: [PATCH 2/2] Make.Rules: Make compile tools configurable
Signed-off-by: Sergey Bobrenok <bobrofon@gmail.com>
---
Make.Rules | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Make.Rules b/Make.Rules
index 91099c6..cd25495 100644
--- a/Make.Rules
+++ b/Make.Rules
@@ -54,15 +54,15 @@ GOMAJOR=0
KERNEL_HEADERS := $(topdir)/libcap/include/uapi
IPATH += -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
-CC := $(CROSS_COMPILE)gcc
+CC ?= $(CROSS_COMPILE)gcc
DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
COPTS ?= -O2
CFLAGS ?= $(COPTS) $(DEFINES)
BUILD_CC ?= $(CC)
BUILD_COPTS ?= -O2
BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH)
-AR := $(CROSS_COMPILE)ar
-RANLIB := $(CROSS_COMPILE)ranlib
+AR ?= $(CROSS_COMPILE)ar
+RANLIB ?= $(CROSS_COMPILE)ranlib
DEBUG = -g #-DDEBUG
WARNINGS=-Wall -Wwrite-strings \
-Wpointer-arith -Wcast-qual -Wcast-align \
--
2.31.1