summaryrefslogtreecommitdiff
path: root/package/osiris
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-22 21:37:50 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-22 21:37:50 (GMT)
commit9436a026e2e23d207fbdcb9e8bc9b076e3573700 (patch)
treeadb1937bc90be8869a5f7c9636da84773414eb3b /package/osiris
parent52b1b0100c53b1f8699955df618fcb47744e0a7e (diff)
activate GCC cflags check, cleanup FLAGS stuff in OpenADK.
* remove TCFLAGS/TLDFLAGS/TCPPFLAGS and only use TARGET_CFLAGS/TARGET_LDFLAGS/TARGET_CPPFLAGS, ... * activate GCC_HONOUR_COPTS and fix all packages to honour CFLAGS * use CC_FOR_BUILD, CFLAGS_FOR_BUILD, ... for all build compilation, remove HOST* variants * introduce KERNEL_MODULE_FLAGS for external kernel modules * mark rpm package as broken, mark syslinux for native builds only, mark libhugetlb for eglibc/glibc only usage
Diffstat (limited to 'package/osiris')
-rw-r--r--package/osiris/Makefile2
-rw-r--r--package/osiris/patches/patch-configure23
-rw-r--r--package/osiris/patches/patch-src_osirisd_modules_Makefile_am11
-rw-r--r--package/osiris/patches/patch-src_osirisd_modules_Makefile_in11
4 files changed, 31 insertions, 16 deletions
diff --git a/package/osiris/Makefile b/package/osiris/Makefile
index 01049ac..6722f4e 100644
--- a/package/osiris/Makefile
+++ b/package/osiris/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --with-osiris-user=root \
--with-readline=no
XAKE_FLAGS+= ar=${TARGET_CROSS}ar \
INTERACTIVE=0
-TCFLAGS+= -DOPENSSL_NO_RIPEMD
+TARGET_CFLAGS+= -DOPENSSL_NO_RIPEMD
post-configure:
(cd ${WRKDIST}/src/osirisd/modules && ./genmods.sh);
diff --git a/package/osiris/patches/patch-configure b/package/osiris/patches/patch-configure
index b9ae74f..6dce9a8 100644
--- a/package/osiris/patches/patch-configure
+++ b/package/osiris/patches/patch-configure
@@ -1,13 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- osiris-4.2.3.orig/configure 2006-07-28 01:57:51.000000000 +0200
-+++ osiris-4.2.3/configure 2011-01-16 15:16:06.000000000 +0100
-@@ -1,4 +1,5 @@
- #! /bin/sh
-+set -x
- # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.59.
- #
-@@ -3403,7 +3404,7 @@ else
++++ osiris-4.2.3/configure 2011-01-21 20:40:11.234913757 +0100
+@@ -3403,7 +3403,7 @@ else
fi
@@ -16,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
AUTOHEADER=echo
if test "x$prefix" = "xNONE" ; then
-@@ -3573,7 +3574,6 @@ else
+@@ -3573,7 +3573,6 @@ else
for ssldir in $tryssldir "" /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl ; do
CPPFLAGS="$saved_CPPFLAGS"
@@ -24,7 +17,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
# GOD DAMN FUCKING STATIC BINARIES ON SOLARIS CAN EAT MY ASS.
-@@ -3596,29 +3596,6 @@ else
+@@ -3596,29 +3595,6 @@ else
if test ! -z "$ssldir" -a ! -d "$ssldir" ; then
continue;
fi
@@ -54,7 +47,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
# Basic test to check for compatible version and correct linking
-@@ -3694,34 +3671,6 @@ fi
+@@ -3694,34 +3670,6 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_openssldir" >&5
echo "${ECHO_T}$ac_cv_openssldir" >&6
@@ -89,7 +82,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
case "$OS_NAME" in
SunOS*)
LIBS="$saved_LIBS $ssldir/lib/libssl.a $ssldir/lib/libcrypto.a"
-@@ -3738,7 +3687,7 @@ CYGWIN*)
+@@ -3738,7 +3686,7 @@ CYGWIN*)
esac
@@ -98,7 +91,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
case "${OS_NAME}" in
MINGW32*)
-@@ -4448,11 +4397,6 @@ cat >>confdefs.h <<_ACEOF
+@@ -4448,11 +4396,6 @@ cat >>confdefs.h <<_ACEOF
#define SYSTEM_LINUX 1
_ACEOF
@@ -110,7 +103,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
;;
BSD*)
-@@ -11394,7 +11338,6 @@ chmod ug+x src/install/install.sh
+@@ -11394,7 +11337,6 @@ chmod ug+x src/install/install.sh
echo " Osiris MD Directory: ${with_md_root_dir}"
echo " Osiris MD user: ${with_osiris_md_user}"
echo " Osiris MD config dir: ${with_md_conf_dir}"
diff --git a/package/osiris/patches/patch-src_osirisd_modules_Makefile_am b/package/osiris/patches/patch-src_osirisd_modules_Makefile_am
new file mode 100644
index 0000000..332a866
--- /dev/null
+++ b/package/osiris/patches/patch-src_osirisd_modules_Makefile_am
@@ -0,0 +1,11 @@
+--- osiris-4.2.3.orig/src/osirisd/modules/Makefile.am 2006-07-28 01:57:51.000000000 +0200
++++ osiris-4.2.3/src/osirisd/modules/Makefile.am 2011-01-21 20:47:14.568658281 +0100
+@@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/src \
+ noinst_SCRIPTS = modules
+
+ unused.o:
+- $(CC) -c unused.c
++ $(CC) $(CFLAGS) -c unused.c
+
+ libmodules_a_DEPENDENCIES = unused.o
+
diff --git a/package/osiris/patches/patch-src_osirisd_modules_Makefile_in b/package/osiris/patches/patch-src_osirisd_modules_Makefile_in
new file mode 100644
index 0000000..459702d
--- /dev/null
+++ b/package/osiris/patches/patch-src_osirisd_modules_Makefile_in
@@ -0,0 +1,11 @@
+--- osiris-4.2.3.orig/src/osirisd/modules/Makefile.in 2006-07-28 01:57:51.000000000 +0200
++++ osiris-4.2.3/src/osirisd/modules/Makefile.in 2011-01-21 20:47:02.618658788 +0100
+@@ -254,7 +254,7 @@ uninstall-am: uninstall-info-am
+
+
+ unused.o:
+- $(CC) -c unused.c
++ $(CC) $(CFLAGS) -c unused.c
+
+ modules:
+ ./genmods.sh