diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-04-13 04:53:20 +0200 |
| commit | 92623154c7b3edde7bf4812530e4db9de2779283 (patch) | |
| tree | 4d9a5df1ec44939ce4731af80a56471643eaf815 /package/beecrypt | |
| parent | 4090002fc466e4319c95ab214c3f92ecc7b59184 (diff) | |
| parent | 933e74c07231e815bbfd9ed90073308eaf253a00 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/mpfr/Makefile
Diffstat (limited to 'package/beecrypt')
| -rw-r--r-- | package/beecrypt/Makefile | 5 | ||||
| -rw-r--r-- | package/beecrypt/patches/patch-include_beecrypt_gnu_h | 11 | ||||
| -rw-r--r-- | package/beecrypt/patches/patch-ltmain_sh | 11 |
3 files changed, 25 insertions, 2 deletions
diff --git a/package/beecrypt/Makefile b/package/beecrypt/Makefile index 333434a37..5e1e71e50 100644 --- a/package/beecrypt/Makefile +++ b/package/beecrypt/Makefile @@ -15,13 +15,14 @@ PKG_NEED_CXX:= 1 include $(TOPDIR)/mk/package.mk -$(eval $(call PKG_template,BEECRYPT,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,BEECRYPT,beecrypt,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS)) CONFIGURE_ARGS+= --without-cplusplus \ --without-python \ --without-java -post-install: +beecrypt-install: $(INSTALL_DIR) $(IDIR_BEECRYPT)/usr/lib $(CP) $(WRKINST)/usr/lib/libbeecrypt*.so* \ $(IDIR_BEECRYPT)/usr/lib diff --git a/package/beecrypt/patches/patch-include_beecrypt_gnu_h b/package/beecrypt/patches/patch-include_beecrypt_gnu_h new file mode 100644 index 000000000..41b1f5953 --- /dev/null +++ b/package/beecrypt/patches/patch-include_beecrypt_gnu_h @@ -0,0 +1,11 @@ +--- beecrypt-4.2.1.orig/include/beecrypt/gnu.h 2009-07-12 09:19:44.000000000 +0200 ++++ beecrypt-4.2.1/include/beecrypt/gnu.h 2011-03-29 11:18:21.031808259 +0200 +@@ -72,7 +72,7 @@ typedef pthread_t bc_threadid_t; + * make assumptions about the size set by the configure script + */ + #if !defined(MP_WBITS) +-# define MP_WBITS 64U ++# define MP_WBITS 32U + #endif + + #endif diff --git a/package/beecrypt/patches/patch-ltmain_sh b/package/beecrypt/patches/patch-ltmain_sh new file mode 100644 index 000000000..f018ba5c1 --- /dev/null +++ b/package/beecrypt/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- beecrypt-4.2.1.orig/ltmain.sh 2009-07-11 18:02:10.000000000 +0200 ++++ beecrypt-4.2.1/ltmain.sh 2011-03-29 11:27:09.431818481 +0200 +@@ -4772,7 +4772,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" |