aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

Browse source 
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 • committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/r-modules/patches/RAppArmor.patch Normal file
View file

@ -0,0 +1,20 @@
diff -ru -x '*~' RAppArmor_orig/configure RAppArmor/configure
--- RAppArmor_orig/configure 2013-12-17 11:23:00.000000000 +0900
+++ RAppArmor/configure 2014-10-18 22:22:39.641341244 +0900
@@ -1,15 +1,2 @@
-if [ ! -e /usr/include/sys/apparmor.h ]
-then
- echo "sys/apparmor.h not found. Make sure libapparmor-dev is installed."
- exit 1
-fi
-
-LIBFILE=$(/sbin/ldconfig -p | egrep -oh " [-_a-zA-Z0-9/]*/libapparmor.so(.1)?$")
-
-if [ -z "$LIBFILE" ]
-then
- echo "libapparmor.so not found. Make sure libapparmor-dev is installed."
- exit 1
-fi
-
+LIBFILE="$LIBAPPARMOR_HOME/lib/libapparmor.so.1"
echo "PKG_LIBS="$LIBFILE > src/Makevars

33
pkgs/development/r-modules/patches/RNifti.patch Normal file
View file

@ -0,0 +1,33 @@
diff --git a/configure.ac b/configure.ac
index 05e8a1e..2dcde81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,16 +17,5 @@ CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS`
CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS`
LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`
-# Checks for libraries.
-ZLIB_FLAGS="-Izlib"
-ZLIB_OBJECTS=`ls -1 src/zlib/*.c | sed 's/^src\///' | sed 's/\\.c$/\\.o/'`
-AC_SEARCH_LIBS([inflate], [z], [
- ZLIB_FLAGS=""
- ZLIB_OBJECTS=""
-])
-
-AC_SUBST(ZLIB_FLAGS)
-AC_SUBST(ZLIB_OBJECTS)
-
AC_CONFIG_FILES([src/Makevars])
AC_OUTPUT
diff --git a/src/Makevars.in b/src/Makevars.in
index 77da572..358cc1d 100644
--- a/src/Makevars.in
+++ b/src/Makevars.in
@@ -1,5 +1,5 @@
-PKG_CPPFLAGS = -DNDEBUG -DHAVE_ZLIB -DUSING_R -DRNIFTI_NIFTILIB_DEDUPLICATE -I../inst/include @ZLIB_FLAGS@
+PKG_CPPFLAGS = -DNDEBUG -DHAVE_ZLIB -DUSING_R -DRNIFTI_NIFTILIB_DEDUPLICATE -I../inst/include
PKG_LIBS = @LIBS@
NIFTI_OBJECTS = znzlib/znzlib.o niftilib/nifti1_io.o niftilib/nifti2_io.o
-OBJECTS = main.o zzz.o @ZLIB_OBJECTS@ $(NIFTI_OBJECTS)
+OBJECTS = main.o zzz.o $(NIFTI_OBJECTS)

15
pkgs/development/r-modules/patches/Rserve.patch Normal file
View file

@ -0,0 +1,15 @@
diff -ru -x '*~' Rserve_orig/src/Makevars.in Rserve/src/Makevars.in
--- Rserve_orig/src/Makevars.in 2013-08-22 06:09:33.000000000 +0900
+++ Rserve/src/Makevars.in 2014-11-09 21:36:31.184590320 +0900
@@ -12,8 +12,9 @@
$(CC) -DSTANDALONE_RSERVE -DRSERV_DEBUG -DNODAEMON -I. -Iinclude $(ALL_CPPFLAGS) $(ALL_CFLAGS) $(PKG_CPPFLAGS) $(PKG_CFLAGS) -o Rserve.dbg $(SERVER_SRC) $(ALL_LIBS) $(PKG_LIBS)
# merging to bin/Rserve works only if installed from sources, won't work for binary
- -./mergefat Rserve "$(R_HOME)/bin/Rserve"
- -./mergefat Rserve.dbg "$(R_HOME)/bin/Rserve.dbg"
+ mkdir $(out)/bin
+ -./mergefat Rserve "$(out)/bin/Rserve"
+ -./mergefat Rserve.dbg "$(out)/bin/Rserve.dbg"
client: config.h
cp config.h client/cxx/

8
pkgs/development/r-modules/patches/spMC.patch Normal file
View file

@ -0,0 +1,8 @@
Only in spMC_orig: spMC
diff -ru -x '*~' spMC_orig/src/Makevars spMC/src/Makevars
--- spMC_orig/src/Makevars 2014-09-19 21:23:30.000000000 +0900
+++ spMC/src/Makevars 2014-10-25 18:14:48.366954769 +0900
@@ -1,2 +1,2 @@
PKG_CFLAGS=$(SHLIB_OPENMP_CFLAGS)
-PKG_LIBS=$(SHLIB_OPENMP_CFLAGS) $(BLAS_LIBS) $(LAPACK_LIBS) $(FLIBS)
+PKG_LIBS=$(SHLIB_OPENMP_CFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)