Changeset e9b6e37 in freewrt for mk

Timestamp:

Jun 26, 2007, 7:52:21 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

4e3b7a7

Parents:

9bba111

Message:

some of our developers seem to like adding features, breaking edge
conditions during that and not fixing them… this bugged wbx@ so much
he told me to fix openssl for once and for good… had he known what
I was going to do… well, he had quite a few shock moments watching me
hacking on this, but eventually he said, as long as it works for ms@
it's okay… here we are

copy the bsd make build system for openssl from MirBSD and update it
for openssl 0.9.8 (from 0.9.7); the openssl upstream makefiles are
just much too broken. allow the user to disable patented ciphers, as
in MirBSD, but not more. if you use OpenSSL, you have all ciphers, so
be it.

I'll test this ASAP on real hardware.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@2940 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

mk

Files:

• pkg-bottom.mk (modified) (1 diff)
• vars.mk (modified) (1 diff)

mk/pkg-bottom.mk

@@ -68 +68 @@
             ${CONFIGURE_ARGS}
 else ifneq ($(filter bsd,${CONFIGURE_STYLE}),)
-        cd ${WRKBUILD} && ${BSDMAKE} obj
+        cd ${WRKBUILD} && env ${MAKE_ENV} ${BSDMAKE} -f ${MAKE_FILE} \
+            ${MAKE_FLAGS} obj
+        cd ${WRKBUILD} && env ${MAKE_ENV} ${BSDMAKE} -f ${MAKE_FILE} \
+            ${MAKE_FLAGS} depend
 else ifeq ($(filter-out manual,${CONFIGURE_STYLE}),)
         env ${CONFIGURE_ENV} ${MAKE} do-configure

mk/vars.mk

@@ -23 +23 @@
 BSDMAKE_FLAGS+=         DOCOWN=${BUILD_USER} DOCGRP=${BUILD_GROUP}
 BSDMAKE_FLAGS+=         NONBINMODE=0644 CONFGRP=${BUILD_GROUP} INSTALL_STRIP=
-BSDMAKE_FLAGS+=         MACHINE=${CPU_ARCH} MACHINE_ARCH=${CPU_ARCH}
+BSDMAKE_FLAGS+=         MACHINE=${ARCH} MACHINE_ARCH=${ARCH} NOMAN=Yes
 BSDMAKE=                env MAKEFLAGS=V=99 MFLAGS= BSDOBJDIR='${BUILD_DIR}' \
                         LD='${TARGET_CROSS}ld' ${BMAKE} ${BSDMAKE_FLAGS}