aboutsummaryrefslogtreecommitdiff
path: root/tools/depends
diff options
context:
space:
mode:
Diffstat (limited to 'tools/depends')
-rw-r--r--tools/depends/Makefile.include.in1
-rw-r--r--tools/depends/configure.in2
-rw-r--r--tools/depends/native/Makefile2
-rw-r--r--tools/depends/native/fakeroot-native/Makefile42
-rw-r--r--tools/depends/native/gen_entitlements-native/Makefile14
-rwxr-xr-xtools/depends/native/gen_entitlements-native/gen_entitlements.py36
-rw-r--r--tools/depends/target/Backrow/Makefile2
-rw-r--r--tools/depends/target/libffi/Makefile6
-rw-r--r--tools/depends/target/libmpeg2/06-dont-asm-motion-comp.patch64
-rw-r--r--tools/depends/target/libmpeg2/Makefile7
-rw-r--r--tools/depends/target/python26/Makefile2
11 files changed, 173 insertions, 5 deletions
diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in
index 3f79caa132..76688cd499 100644
--- a/tools/depends/Makefile.include.in
+++ b/tools/depends/Makefile.include.in
@@ -20,6 +20,7 @@ OS=@platform_os@
CROSS_COMPILING=@cross_compiling@
ARCH_DEFINES=@ARCH_DEFINES@
TARGET_PLATFORM=@use_platform@
+XCODE_VERSION=@use_xcode@
HAS_ZLIB=@has_zlib@
NEED_LIBICONV=@need_libiconv@
diff --git a/tools/depends/configure.in b/tools/depends/configure.in
index da7ccbc5ce..17d7d9f8b4 100644
--- a/tools/depends/configure.in
+++ b/tools/depends/configure.in
@@ -183,7 +183,7 @@ case $host in
*)
platform_cc=clang
platform_cxx=clang++
- platform_cflags="-fheinous-gnu-extensions -no-cpp-precomp -no-integrated-as"
+ platform_cflags="-fheinous-gnu-extensions -no-cpp-precomp"
platform_ldflags="-Wl,-search_paths_first"
platform_cxxflags="-no-cpp-precomp"
;;
diff --git a/tools/depends/native/Makefile b/tools/depends/native/Makefile
index 9bbdd460a8..b03f7a13b6 100644
--- a/tools/depends/native/Makefile
+++ b/tools/depends/native/Makefile
@@ -13,7 +13,7 @@ NATIVE= m4-native gettext-native autoconf-native automake-native \
ifeq ($(OS),ios)
- NATIVE += dpkg-native xz-native tar-native
+ NATIVE += dpkg-native xz-native tar-native fakeroot-native gen_entitlements-native
endif
ifeq ($(OS),osx)
diff --git a/tools/depends/native/fakeroot-native/Makefile b/tools/depends/native/fakeroot-native/Makefile
new file mode 100644
index 0000000000..43ac4055fe
--- /dev/null
+++ b/tools/depends/native/fakeroot-native/Makefile
@@ -0,0 +1,42 @@
+include ../../Makefile.include
+PREFIX=$(NATIVEPREFIX)
+PLATFORM=$(NATIVEPLATFORM)
+DEPS= ../../Makefile.include.in Makefile
+
+APPNAME=fakeroot
+VERSION=macosx-v3.3
+SOURCE=$(APPNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+APP_BASE_URL=http://github.com/downloads/mackyle/fakeroot
+
+# configuration settings
+CONFIGURE=./configure --prefix=$(PREFIX) --disable-dependency-tracking --disable-static
+
+APP=$(PLATFORM)/$(APPNAME)
+
+CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
+
+all: .installed-$(PLATFORM)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+ cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(APP_BASE_URL)/$(ARCHIVE)
+
+$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
+ -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
+ cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+ cd $(PLATFORM); $(CONFIGURE)
+
+$(APP): $(PLATFORM)
+ $(MAKE) -C $(PLATFORM)
+
+.installed-$(PLATFORM): $(APP)
+ $(MAKE) -C $(PLATFORM) install
+ touch $@
+
+clean:
+ $(MAKE) -C $(PLATFORM) clean
+ rm .installed-$(PLATFORM)
+
+distclean::
+ rm -rf $(PLATFORM) .installed-$(PLATFORM)
+
diff --git a/tools/depends/native/gen_entitlements-native/Makefile b/tools/depends/native/gen_entitlements-native/Makefile
new file mode 100644
index 0000000000..a16b4549f6
--- /dev/null
+++ b/tools/depends/native/gen_entitlements-native/Makefile
@@ -0,0 +1,14 @@
+include ../../Makefile.include
+
+GEBIN=$(NATIVEPREFIX)/bin/gen_entitlements.py
+
+all: $(GEBIN)
+
+$(GEBIN):
+ mkdir -p $(NATIVEPREFIX)/bin
+ cp gen_entitlements.py $(GEBIN)
+ chmod 755 $(GEBIN)
+
+clean:
+distclean::
+ rm -f $(GEBIN)
diff --git a/tools/depends/native/gen_entitlements-native/gen_entitlements.py b/tools/depends/native/gen_entitlements-native/gen_entitlements.py
new file mode 100755
index 0000000000..d8ae6af3ee
--- /dev/null
+++ b/tools/depends/native/gen_entitlements-native/gen_entitlements.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+
+import sys
+import struct
+
+if len(sys.argv) != 3:
+ print "Usage: %s appname dest_file.xcent" % sys.argv[0]
+ sys.exit(-1)
+
+APPNAME = sys.argv[1]
+DEST = sys.argv[2]
+
+if not DEST.endswith('.xml') and not DEST.endswith('.xcent'):
+ print "Dest must be .xml (for ldid) or .xcent (for codesign)"
+ sys.exit(-1)
+
+entitlements = """
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>application-identifier</key>
+ <string>%s</string>
+ <key>get-task-allow</key>
+ <true/>
+</dict>
+</plist>
+""" % APPNAME
+
+f = open(DEST,'w')
+if DEST.endswith('.xcent'):
+ f.write("\xfa\xde\x71\x71")
+ f.write(struct.pack('>L', len(entitlements) + 8))
+f.write(entitlements)
+f.close()
+
diff --git a/tools/depends/target/Backrow/Makefile b/tools/depends/target/Backrow/Makefile
index 22cc1b8c01..7ceb06fc6c 100644
--- a/tools/depends/target/Backrow/Makefile
+++ b/tools/depends/target/Backrow/Makefile
@@ -17,7 +17,7 @@ $(PLATFORM)/$(SOURCE): $(TARBALLS_LOCATION)/$(ARCHIVE)
.installed-$(PLATFORM): $(PLATFORM)/$(SOURCE)
mkdir -p $(PREFIX)/include
- cp -rf $(PLATFORM)/$(SOURCE) $(PREFIX)/include/
+ cp -pR $(PLATFORM)/$(SOURCE) $(PREFIX)/include/
touch $@
clean:
diff --git a/tools/depends/target/libffi/Makefile b/tools/depends/target/libffi/Makefile
index 958c586587..3a4ed476a3 100644
--- a/tools/depends/target/libffi/Makefile
+++ b/tools/depends/target/libffi/Makefile
@@ -8,7 +8,11 @@ SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
# configuration settings
-CONFIGURE= ./configure --prefix=$(PREFIX) --disable-shared --disable-builddir
+CONFIGURE= ./configure --prefix=$(PREFIX) --disable-shared --disable-builddir
+ifeq ($(OS), ios)
+CONFIGURE+=CFLAGS=-no-integrated-as
+endif
+
LIBDYLIB=$(PLATFORM)/.libs/$(LIBNAME).a
diff --git a/tools/depends/target/libmpeg2/06-dont-asm-motion-comp.patch b/tools/depends/target/libmpeg2/06-dont-asm-motion-comp.patch
new file mode 100644
index 0000000000..80a76443f7
--- /dev/null
+++ b/tools/depends/target/libmpeg2/06-dont-asm-motion-comp.patch
@@ -0,0 +1,64 @@
+diff --git a/libmpeg2/Makefile.am b/libmpeg2/Makefile.am
+index a4dd944..c113bf9 100644
+--- a/libmpeg2/Makefile.am
++++ b/libmpeg2/Makefile.am
+@@ -14,7 +14,7 @@
+ motion_comp_vis.c motion_comp_arm.c \
+ cpu_accel.c cpu_state.c
+ if ARCH_ARM
+-libmpeg2arch_la_SOURCES += motion_comp_arm_s.S motion_comp_neon.c
++libmpeg2arch_la_SOURCES += motion_comp_neon.c
+ endif
+ libmpeg2arch_la_CFLAGS = $(OPT_CFLAGS) $(ARCH_OPT_CFLAGS) $(LIBMPEG2_CFLAGS)
+
+--- a/libmpeg2/motion_comp_arm.c
++++ b/libmpeg2/motion_comp_arm.c
+@@ -93,14 +93,21 @@ MC_FUNC (put,y)
+ MC_FUNC (avg,y)
+ MC_FUNC (put,xy)
+ MC_FUNC (avg,xy)
++MC_FUNC (put,o)
++MC_FUNC (put,x)
+
+
+-extern void MC_put_o_16_arm (uint8_t * dest, const uint8_t * ref,
+- int stride, int height);
+-
+-extern void MC_put_x_16_arm (uint8_t * dest, const uint8_t * ref,
+- int stride, int height);
++static void MC_put_o_16_arm (uint8_t * dest, const uint8_t * ref,
++ int stride, int height)
++{
++ MC_put_o_16_c(dest, ref, stride, height);
++}
+
++static void MC_put_x_16_arm (uint8_t * dest, const uint8_t * ref,
++ int stride, int height)
++{
++ MC_put_x_16_c(dest, ref, stride, height);
++}
+
+ static void MC_put_y_16_arm (uint8_t * dest, const uint8_t * ref,
+ int stride, int height)
+@@ -114,11 +121,17 @@ static void MC_put_xy_16_arm (uint8_t * dest, const uint8_t * ref,
+ MC_put_xy_16_c(dest, ref, stride, height);
+ }
+
+-extern void MC_put_o_8_arm (uint8_t * dest, const uint8_t * ref,
+- int stride, int height);
++static void MC_put_o_8_arm (uint8_t * dest, const uint8_t * ref,
++ int stride, int height)
++{
++ MC_put_o_8_c(dest, ref, stride, height);
++}
+
+-extern void MC_put_x_8_arm (uint8_t * dest, const uint8_t * ref,
+- int stride, int height);
++static void MC_put_x_8_arm (uint8_t * dest, const uint8_t * ref,
++ int stride, int height)
++{
++ MC_put_x_8_c(dest, ref, stride, height);
++}
+
+ static void MC_put_y_8_arm (uint8_t * dest, const uint8_t * ref,
+ int stride, int height)
diff --git a/tools/depends/target/libmpeg2/Makefile b/tools/depends/target/libmpeg2/Makefile
index 54eba7cce0..8916495d98 100644
--- a/tools/depends/target/libmpeg2/Makefile
+++ b/tools/depends/target/libmpeg2/Makefile
@@ -30,6 +30,13 @@ ifeq ($(OS),ios)
endif
cd $(PLATFORM); patch -p1 < ../04-clang-fix.patch
cd $(PLATFORM); patch -p0 < ../05-upstream-motion_comp_arm_s.S-is-not-PIC-enough.patch
+ifeq ($(OS),ios)
+ case $(XCODE_VERSION) in \
+ 5.* | 5.*.*) \
+ cd $(PLATFORM); patch -p1 < ../06-dont-asm-motion-comp.patch \
+ ;;\
+ esac
+endif
cd $(PLATFORM); $(AUTORECONF) -vif
cd $(PLATFORM); $(CONFIGURE)
diff --git a/tools/depends/target/python26/Makefile b/tools/depends/target/python26/Makefile
index 56fbb8cda4..f502a66b67 100644
--- a/tools/depends/target/python26/Makefile
+++ b/tools/depends/target/python26/Makefile
@@ -13,7 +13,7 @@ ARCHIVE=$(SOURCE).tar.bz2
CONFIGURE=OPT="$(CFLAGS)" \
LIBS=-lm \
./configure --prefix=$(PREFIX) \
- --disable-toolbox-glue --disable-framework --with-system-ffi \
+ --disable-toolbox-glue --disable-framework --with-system-ffi --without-pymalloc \
LIBDYLIB=$(PLATFORM)/libpython2.6.a
generated by cgit v1.2.3 (git 2.26.2) at 2025-02-27 12:53:21 +0000