diff options
Diffstat (limited to 'package/opensc')
| -rw-r--r-- | package/opensc/Makefile | 6 | ||||
| -rw-r--r-- | package/opensc/patches/patch-ltmain_sh | 39 | ||||
| -rw-r--r-- | package/opensc/patches/patch-src_Makefile_in | 6 |
3 files changed, 43 insertions, 8 deletions
diff --git a/package/opensc/Makefile b/package/opensc/Makefile index 96c3e4138..88a85939e 100644 --- a/package/opensc/Makefile +++ b/package/opensc/Makefile @@ -32,14 +32,10 @@ CONFIGURE_ARGS+= --disable-man \ --enable-pcsc \ --enable-openct -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_LIBOPENSC_DEV}+= libopensc-dev-install - post-extract: cd ${WRKBUILD} && autoreconf -vif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} +post-install: ${INSTALL_DIR} ${IDIR_OPENSC}/usr/bin ${INSTALL_DIR} ${IDIR_OPENSC}/usr/share/opensc ${INSTALL_DATA} ${WRKINST}/usr/share/opensc/* \ diff --git a/package/opensc/patches/patch-ltmain_sh b/package/opensc/patches/patch-ltmain_sh new file mode 100644 index 000000000..7797c4fcc --- /dev/null +++ b/package/opensc/patches/patch-ltmain_sh @@ -0,0 +1,39 @@ +--- opensc-0.11.13.orig/ltmain.sh 2011-01-16 13:51:11.000000000 +0100 ++++ opensc-0.11.13/ltmain.sh 2011-01-16 13:46:22.000000000 +0100 +@@ -5840,7 +5840,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" +@@ -6635,27 +6635,6 @@ func_mode_link () + esac + fi + +- # Hardcode the library path. +- # Skip directories that are in the system default run-time +- # search path. +- case " $sys_lib_dlsearch_path " in +- *" $absdir "*) ;; +- *) +- case "$compile_rpath " in +- *" $absdir "*) ;; +- *) func_append compile_rpath " $absdir" ;; +- esac +- ;; +- esac +- case " $sys_lib_dlsearch_path " in +- *" $libdir "*) ;; +- *) +- case "$finalize_rpath " in +- *" $libdir "*) ;; +- *) func_append finalize_rpath " $libdir" ;; +- esac +- ;; +- esac + fi # $linkmode,$pass = prog,link... + + if test "$alldeplibs" = yes && diff --git a/package/opensc/patches/patch-src_Makefile_in b/package/opensc/patches/patch-src_Makefile_in index 63d41a20e..f2891678f 100644 --- a/package/opensc/patches/patch-src_Makefile_in +++ b/package/opensc/patches/patch-src_Makefile_in @@ -1,6 +1,6 @@ ---- opensc-0.11.13.orig/src/Makefile.in 2010-02-16 10:32:17.000000000 +0100 -+++ opensc-0.11.13/src/Makefile.in 2010-12-15 21:48:57.000000000 +0100 -@@ -260,8 +260,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil +--- opensc-0.11.13.orig/src/Makefile.in 2011-01-09 00:58:50.000000000 +0100 ++++ opensc-0.11.13/src/Makefile.in 2011-01-09 00:56:00.000000000 +0100 +@@ -263,8 +263,8 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil EXTRA_DIST = Makefile.mak # Order IS important |