uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
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:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
27
pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
Normal file
27
pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
diff --git a/configure.ac b/configure.ac
|
||||
index 5fd3c8de..7ae343e0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -228,6 +228,10 @@ if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then
|
||||
AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.])
|
||||
fi
|
||||
|
||||
+if test "x$use_bdjava_jar" = "xyes"; then
|
||||
+ CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
|
||||
+fi
|
||||
+
|
||||
AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
|
||||
AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
|
||||
AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
|
||||
diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
|
||||
index 511ad533..e273b9e0 100644
|
||||
--- a/src/libbluray/bdj/bdj.c
|
||||
+++ b/src/libbluray/bdj/bdj.c
|
||||
@@ -478,6 +478,7 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage)
|
||||
// pre-defined search paths for libbluray.jar
|
||||
static const char * const jar_paths[] = {
|
||||
#ifndef _WIN32
|
||||
+ JARDIR "/" BDJ_JARFILE,
|
||||
"/usr/share/java/" BDJ_JARFILE,
|
||||
"/usr/share/libbluray/lib/" BDJ_JARFILE,
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue