Compile odcctools for appletv

4 files changed, 98 insertions, 13 deletions

diff --git a/data/odcctools/_metadata/in.1200.00 b/data/odcctools/_metadata/in.1200.00
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/data/odcctools/_metadata/in.1200.00
diff --git a/data/odcctools/fixes.diff b/data/odcctools/fixes.diff
index 82a861957..d2b7b8fda 100644
--- a/data/odcctools/fixes.diff
+++ b/data/odcctools/fixes.diff
@@ -12,13 +12,3 @@ diff -ur cctools-895/libmacho/Makefile cctools-895+iPhone/libmacho/Makefile
  
  ifneq "" "$(SDKROOT)"
    SDK = -isysroot $(SDKROOT)
-@@ -324,7 +322,7 @@
- 	    install -c -m 555 dtmp_obj/libmacho.dylib			\
- 		     $(DSTROOT)$(DYLIBDIR)/libmacho.dylib;		\
- 	    $(STRIP) -S $(DSTROOT)$(DYLIBDIR)/libmacho.dylib;		\
--	    install -c -m 555 dtmp_obj/libmacho_profile.dylib		\
-+	    install -c -m 555 ptmp_obj/libmacho_profile.dylib		\
- 		     $(DSTROOT)$(DYLIBDIR)/libmacho_profile.dylib;	\
- 	    $(STRIP) -S $(DSTROOT)$(DYLIBDIR)/libmacho_profile.dylib;	\
- 	    install -c -m 555 dtmp_obj/libmacho_debug.dylib		\
-Only in cctools-895+iPhone/libmacho: Makefile.orig
diff --git a/data/odcctools/make.sh b/data/odcctools/make.sh
index c62939346..6c24ea537 100644
--- a/data/odcctools/make.sh
+++ b/data/odcctools/make.sh
@@ -1,7 +1,9 @@
 pkg:setup
-pkg: export RC_ProjectSourceVersion="$(cat ${PKG_DATA}/_metadata/version)"
-pkg:make DSTROOT="${PKG_DEST}" SDKROOT="${PKG_ROOT}"
-pkg:install DSTROOT="${PKG_DEST}" SDKROOT="${PKG_ROOT}"
+VERS="$(pkg: cat %/_metadata/version)"
+pkg:make RC_ProjectSourceVersion="${VERS}"
+#pkg:make DSTROOT="${PKG_DEST}" SDKROOT="${PKG_ROOT}" RC_ProjectSourceVersion="${VERS}"
+#make install CC="${PKG_TARG}-gcc" CXX="${PKG_TARG}-g++" AR="${PKG_TARG}-ar" DSTROOT="${PKG_DEST}" SDKROOT="${PKG_ROOT}" RC_ProjectSourceVersion="${VERS}"
+make install CC="${PKG_TARG}-gcc" CXX="${PKG_TARG}-g++" AR="${PKG_TARG}-ar" DSTROOT="${PKG_DEST}" RC_ProjectSourceVersion="${VERS}"
 pkg: rm -f /usr/lib/system/libmacho.dylib /usr/bin/{nm,otool,size}
 pkg: mv -f /usr/bin/ar{,-classic}
 pkg: ln -s llvm-ar /usr/bin/ar
diff --git a/data/odcctools/perms.diff b/data/odcctools/perms.diff
new file mode 100644
index 000000000..c1c4fdc4d
--- /dev/null
+++ b/data/odcctools/perms.diff
@@ -0,0 +1,93 @@
+diff -ur cctools-895/cbtlibs/Makefile cctools-895+iOS/cbtlibs/Makefile
+--- cctools-895/cbtlibs/Makefile	2016-12-09 08:02:55.000000000 -1000
++++ cctools-895+iOS/cbtlibs/Makefile	2019-12-02 16:16:47.000000000 -1000
+@@ -42,7 +42,7 @@
+ 	$(MKDIRS) $(SRCROOT)
+ 	chmod 755 $(SRCROOT)
+ 	gnutar cf - $(INSTALL_FILES) | (cd $(SRCROOT); gnutar xf -)
+-	chmod 444 $(SRCROOT)/*
++	chmod 644 $(SRCROOT)/*
+ 
+ $(SYMROOT):
+ 	$(MKDIRS) $@
+@@ -61,7 +61,7 @@
+ 
+ lib_ofiles_install: lib_ofiles
+ 	$(MKDIRS) $(DSTROOT)$(LOCLIBDIR)
+-	install -p -c -m 444 $(SYMROOT)/libsyminfo.a \
++	install -p -c -m 644 $(SYMROOT)/libsyminfo.a \
+ 		$(DSTROOT)$(LOCLIBDIR)/libsyminfo.a
+ 	$(RANLIB) $(DSTROOT)$(LOCLIBDIR)/libsyminfo.a
+ 
+diff -ur cctools-895/libmacho/Makefile cctools-895+iOS/libmacho/Makefile
+--- cctools-895/libmacho/Makefile	2016-12-09 08:02:59.000000000 -1000
++++ cctools-895+iOS/libmacho/Makefile	2019-12-02 16:19:56.000000000 -1000
+@@ -310,45 +310,45 @@
+ 	$(MKDIRS) $(DSTROOT)$(ARCHIVEDIR) $(DSTROOT)$(DYLIBDIR)
+ 	@if [ $(SRCROOT) = . ];						\
+ 	then								\
+-	    install -c -m 444 dtmp_obj/libmacho.a			\
++	    install -c -m 644 dtmp_obj/libmacho.a			\
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho.a;		\
+ 	    $(RANLIB) $(DSTROOT)$(ARCHIVEDIR)/libmacho.a;		\
+ 	    (cd $(DSTROOT)$(ARCHIVEDIR) ;				\
+ 	    rm -f libmacho_debug.a ; ln -s libmacho.a libmacho_debug.a); \
+-	    install -c -m 444 ptmp_obj/libmacho_pg.a			 \
++	    install -c -m 644 ptmp_obj/libmacho_pg.a			 \
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho_profile.a;	\
+ 	    $(RANLIB) $(DSTROOT)$(ARCHIVEDIR)/libmacho_profile.a;	\
+-	    install -c -m 444 otmp_obj/libmacho_static.a		\
++	    install -c -m 644 otmp_obj/libmacho_static.a		\
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho_static.a;		\
+ 	    $(RANLIB) $(DSTROOT)$(ARCHIVEDIR)/libmacho_static.a;	\
+-	    install -c -m 555 dtmp_obj/libmacho.dylib			\
++	    install -c -m 755 dtmp_obj/libmacho.dylib			\
+ 		     $(DSTROOT)$(DYLIBDIR)/libmacho.dylib;		\
+ 	    $(STRIP) -S $(DSTROOT)$(DYLIBDIR)/libmacho.dylib;		\
+-	    install -c -m 555 dtmp_obj/libmacho_profile.dylib		\
++	    install -c -m 755 ptmp_obj/libmacho_profile.dylib		\
+ 		     $(DSTROOT)$(DYLIBDIR)/libmacho_profile.dylib;	\
+ 	    $(STRIP) -S $(DSTROOT)$(DYLIBDIR)/libmacho_profile.dylib;	\
+-	    install -c -m 555 dtmp_obj/libmacho_debug.dylib		\
++	    install -c -m 755 dtmp_obj/libmacho_debug.dylib		\
+ 		     $(DSTROOT)$(DYLIBDIR)/libmacho_debug.dylib;	\
+ 	    $(STRIP) -S $(DSTROOT)$(DYLIBDIR)/libmacho_debug.dylib;	\
+ 	else								\
+-	    install -c -m 444 $(SYMROOT)/libmacho.a			\
++	    install -c -m 644 $(SYMROOT)/libmacho.a			\
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho.a;		\
+ 	    $(RANLIB) $(DSTROOT)$(ARCHIVEDIR)/libmacho.a;		\
+ 	    (cd $(DSTROOT)$(ARCHIVEDIR) ;				\
+ 	    rm -f libmacho_debug.a ; ln -s libmacho.a libmacho_debug.a); \
+-	    install -c -m 444 $(SYMROOT)/libmacho_pg.a			 \
++	    install -c -m 644 $(SYMROOT)/libmacho_pg.a			 \
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho_profile.a;	\
+ 	    $(RANLIB) $(DSTROOT)$(ARCHIVEDIR)/libmacho_profile.a;	\
+-	    install -c -m 444 $(SYMROOT)/libmacho_static.a		\
++	    install -c -m 644 $(SYMROOT)/libmacho_static.a		\
+ 		     $(DSTROOT)$(ARCHIVEDIR)/libmacho_static.a;		\
+ 	    $(RANLIB) $(DSTROOT)$(ARCHIVEDIR)/libmacho_static.a;	\
+-	    install -c -m 555 $(SYMROOT)/libmacho.dylib		\
++	    install -c -m 755 $(SYMROOT)/libmacho.dylib		\
+ 		     $(DSTROOT)$(DYLIBDIR)/libmacho.dylib;		\
+ 	    $(STRIP) -S $(DSTROOT)$(DYLIBDIR)/libmacho.dylib;		\
+-	    install -c -m 555 $(SYMROOT)/libmacho_profile.dylib	\
++	    install -c -m 755 $(SYMROOT)/libmacho_profile.dylib	\
+ 		     $(DSTROOT)$(DYLIBDIR)/libmacho_profile.dylib;	\
+ 	    $(STRIP) -S $(DSTROOT)$(DYLIBDIR)/libmacho_profile.dylib;	\
+-	    install -c -m 555 $(SYMROOT)/libmacho_debug.dylib	\
++	    install -c -m 755 $(SYMROOT)/libmacho_debug.dylib	\
+ 		     $(DSTROOT)$(DYLIBDIR)/libmacho_debug.dylib;	\
+ 	    $(STRIP) -S $(DSTROOT)$(DYLIBDIR)/libmacho_debug.dylib;	\
+ 	fi
+@@ -360,7 +360,7 @@
+ 	$(MKDIRS) $(SRCROOT)
+ 	chmod 755 $(SRCROOT)
+ 	gnutar cf - $(INSTALL_FILES) | (cd $(SRCROOT); gnutar xf -)
+-	chmod 444 $(SRCROOT)/*
++	chmod 644 $(SRCROOT)/*
+ 
+ $(OFILE_DIRS) $(SYMROOT):
+ 	$(MKDIRS) $@
+Only in cctools-895+iOS/libmacho: Makefile.orig
+Only in cctools-895+iOS/libmacho: Makefile.rej