netsurf: branch master updated. release/3.2-540-g8e60d32
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/8e60d32831fae4934836d...
...commit http://git.netsurf-browser.org/netsurf.git/commit/8e60d32831fae4934836da2...
...tree http://git.netsurf-browser.org/netsurf.git/tree/8e60d32831fae4934836da2f7...
The branch, master has been updated
via 8e60d32831fae4934836da2f760b8026ce6c2d2d (commit)
from c6ada5c089c4c3649dbf2651386b016e2335c8ba (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=8e60d32831fae493483...
commit 8e60d32831fae4934836da2f760b8026ce6c2d2d
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
remove some warnings from freebsd build
diff --git a/Makefile b/Makefile
index b37dcba..c1d9118 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ HOST := $(shell uname -s)
# TODO: Ideally, we want the equivalent of s/[^A-Za-z0-9]/_/g here
HOST := $(subst .,_,$(subst -,_,$(subst /,_,$(HOST))))
+
ifeq ($(HOST),)
HOST := riscos
$(warning Build platform determination failed but that's a known problem for RISC OS so we're assuming a native RISC OS build.)
@@ -51,21 +52,21 @@ else
HOST := riscos
endif
endif
-
ifeq ($(HOST),riscos)
# Build happening on RO platform, default target is RO backend
ifeq ($(TARGET),)
TARGET := riscos
endif
-else
- ifeq ($(HOST),BeOS)
- HOST := beos
- endif
- ifeq ($(HOST),Haiku)
- # Haiku implements the BeOS API
- HOST := beos
- endif
- ifeq ($(HOST),beos)
+endif
+
+ifeq ($(HOST),BeOS)
+ HOST := beos
+endif
+ifeq ($(HOST),Haiku)
+ # Haiku implements the BeOS API
+ HOST := beos
+endif
+ifeq ($(HOST),beos)
# Build happening on BeOS platform, default target is BeOS backend
ifeq ($(TARGET),)
TARGET := beos
@@ -73,44 +74,46 @@ else
ifeq ($(TARGET),haiku)
TARGET := beos
endif
- else
- ifeq ($(HOST),AmigaOS)
- HOST := amiga
- ifeq ($(TARGET),)
- TARGET := amiga
- endif
- else
- ifeq ($(HOST),Darwin)
- HOST := macosx
- ifeq ($(TARGET),)
- TARGET := cocoa
- endif
- endif
- ifeq ($(HOST),FreeMiNT)
- HOST := mint
- endif
- ifeq ($(HOST),mint)
- ifeq ($(TARGET),)
- TARGET := atari
- endif
- endif
- ifeq ($(findstring MINGW,$(HOST)),MINGW)
- # MSYS' uname reports the likes of "MINGW32_NT-6.0"
- HOST := windows
- endif
- ifeq ($(HOST),windows)
- ifeq ($(TARGET),)
- TARGET := windows
- endif
- endif
+endif
- # Default target is GTK backend
- ifeq ($(TARGET),)
- TARGET := gtk
- endif
- endif
+ifeq ($(HOST),AmigaOS)
+ HOST := amiga
+ ifeq ($(TARGET),)
+ TARGET := amiga
+ endif
+endif
+
+ifeq ($(HOST),Darwin)
+ HOST := macosx
+ ifeq ($(TARGET),)
+ TARGET := cocoa
+ endif
+endif
+
+ifeq ($(HOST),FreeMiNT)
+ HOST := mint
+endif
+ifeq ($(HOST),mint)
+ ifeq ($(TARGET),)
+ TARGET := atari
+ endif
+endif
+
+ifeq ($(findstring MINGW,$(HOST)),MINGW)
+ # MSYS' uname reports the likes of "MINGW32_NT-6.0"
+ HOST := windows
+endif
+ifeq ($(HOST),windows)
+ ifeq ($(TARGET),)
+ TARGET := windows
endif
endif
+
+# Default target is GTK backend
+ifeq ($(TARGET),)
+ TARGET := gtk
+endif
+
SUBTARGET =
RESOURCES =
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index e7952bb..805488b 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -38,8 +38,10 @@ GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
-DGTK_DISABLE_SINGLE_INCLUDES \
-DGTK_DISABLE_DEPRECATED \
-DGTK_MULTIHEAD_SAFE \
- -DPANGO_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED
+ -DPANGO_DISABLE_DEPRECATED
+
+# later editions of gtk 2 deprecate interfaces we rely upon for cursors
+# -DGDK_PIXBUF_DISABLE_DEPRECATED
# libsexy currently means we cannot enable this
# -DGDK_DISABLE_DEPRECATED
@@ -88,11 +90,7 @@ define convert_image
S_PIXBUF += $(2)
$(2): $(1)
-ifeq ($(HOST),FreeBSD)
- $(Q)echo "#include <gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h>" > $(2)
-else
$(Q)echo "#include <gdk-pixbuf/gdk-pixdata.h>" > $(2)
-endif
$(Q)gdk-pixbuf-csource --extern --struct --name=$(3) $(1) >> $(2) || \
( rm -f $(2) && false )
diff --git a/utils/nsoption.c b/utils/nsoption.c
index e987a43..72a591d 100644
--- a/utils/nsoption.c
+++ b/utils/nsoption.c
@@ -29,6 +29,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include "desktop/plot_style.h"
#include "utils/errors.h"
diff --git a/utils/nsurl.c b/utils/nsurl.c
index 3b53373..041699d 100644
--- a/utils/nsurl.c
+++ b/utils/nsurl.c
@@ -31,6 +31,7 @@
#include <libwapcaplet/libwapcaplet.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include "utils/corestrings.h"
#include "utils/errors.h"
-----------------------------------------------------------------------
Summary of changes:
Makefile | 93 ++++++++++++++++++++++++++-------------------------
gtk/Makefile.target | 10 +++---
utils/nsoption.c | 1 +
utils/nsurl.c | 1 +
4 files changed, 54 insertions(+), 51 deletions(-)
diff --git a/Makefile b/Makefile
index b37dcba..c1d9118 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,7 @@ HOST := $(shell uname -s)
# TODO: Ideally, we want the equivalent of s/[^A-Za-z0-9]/_/g here
HOST := $(subst .,_,$(subst -,_,$(subst /,_,$(HOST))))
+
ifeq ($(HOST),)
HOST := riscos
$(warning Build platform determination failed but that's a known problem for RISC OS so we're assuming a native RISC OS build.)
@@ -51,21 +52,21 @@ else
HOST := riscos
endif
endif
-
ifeq ($(HOST),riscos)
# Build happening on RO platform, default target is RO backend
ifeq ($(TARGET),)
TARGET := riscos
endif
-else
- ifeq ($(HOST),BeOS)
- HOST := beos
- endif
- ifeq ($(HOST),Haiku)
- # Haiku implements the BeOS API
- HOST := beos
- endif
- ifeq ($(HOST),beos)
+endif
+
+ifeq ($(HOST),BeOS)
+ HOST := beos
+endif
+ifeq ($(HOST),Haiku)
+ # Haiku implements the BeOS API
+ HOST := beos
+endif
+ifeq ($(HOST),beos)
# Build happening on BeOS platform, default target is BeOS backend
ifeq ($(TARGET),)
TARGET := beos
@@ -73,44 +74,46 @@ else
ifeq ($(TARGET),haiku)
TARGET := beos
endif
- else
- ifeq ($(HOST),AmigaOS)
- HOST := amiga
- ifeq ($(TARGET),)
- TARGET := amiga
- endif
- else
- ifeq ($(HOST),Darwin)
- HOST := macosx
- ifeq ($(TARGET),)
- TARGET := cocoa
- endif
- endif
- ifeq ($(HOST),FreeMiNT)
- HOST := mint
- endif
- ifeq ($(HOST),mint)
- ifeq ($(TARGET),)
- TARGET := atari
- endif
- endif
- ifeq ($(findstring MINGW,$(HOST)),MINGW)
- # MSYS' uname reports the likes of "MINGW32_NT-6.0"
- HOST := windows
- endif
- ifeq ($(HOST),windows)
- ifeq ($(TARGET),)
- TARGET := windows
- endif
- endif
+endif
- # Default target is GTK backend
- ifeq ($(TARGET),)
- TARGET := gtk
- endif
- endif
+ifeq ($(HOST),AmigaOS)
+ HOST := amiga
+ ifeq ($(TARGET),)
+ TARGET := amiga
+ endif
+endif
+
+ifeq ($(HOST),Darwin)
+ HOST := macosx
+ ifeq ($(TARGET),)
+ TARGET := cocoa
+ endif
+endif
+
+ifeq ($(HOST),FreeMiNT)
+ HOST := mint
+endif
+ifeq ($(HOST),mint)
+ ifeq ($(TARGET),)
+ TARGET := atari
+ endif
+endif
+
+ifeq ($(findstring MINGW,$(HOST)),MINGW)
+ # MSYS' uname reports the likes of "MINGW32_NT-6.0"
+ HOST := windows
+endif
+ifeq ($(HOST),windows)
+ ifeq ($(TARGET),)
+ TARGET := windows
endif
endif
+
+# Default target is GTK backend
+ifeq ($(TARGET),)
+ TARGET := gtk
+endif
+
SUBTARGET =
RESOURCES =
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index e7952bb..805488b 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -38,8 +38,10 @@ GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \
-DGTK_DISABLE_SINGLE_INCLUDES \
-DGTK_DISABLE_DEPRECATED \
-DGTK_MULTIHEAD_SAFE \
- -DPANGO_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED
+ -DPANGO_DISABLE_DEPRECATED
+
+# later editions of gtk 2 deprecate interfaces we rely upon for cursors
+# -DGDK_PIXBUF_DISABLE_DEPRECATED
# libsexy currently means we cannot enable this
# -DGDK_DISABLE_DEPRECATED
@@ -88,11 +90,7 @@ define convert_image
S_PIXBUF += $(2)
$(2): $(1)
-ifeq ($(HOST),FreeBSD)
- $(Q)echo "#include <gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h>" > $(2)
-else
$(Q)echo "#include <gdk-pixbuf/gdk-pixdata.h>" > $(2)
-endif
$(Q)gdk-pixbuf-csource --extern --struct --name=$(3) $(1) >> $(2) || \
( rm -f $(2) && false )
diff --git a/utils/nsoption.c b/utils/nsoption.c
index e987a43..72a591d 100644
--- a/utils/nsoption.c
+++ b/utils/nsoption.c
@@ -29,6 +29,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include "desktop/plot_style.h"
#include "utils/errors.h"
diff --git a/utils/nsurl.c b/utils/nsurl.c
index 3b53373..041699d 100644
--- a/utils/nsurl.c
+++ b/utils/nsurl.c
@@ -31,6 +31,7 @@
#include <libwapcaplet/libwapcaplet.h>
#include <stdlib.h>
#include <string.h>
+#include <strings.h>
#include "utils/corestrings.h"
#include "utils/errors.h"
--
NetSurf Browser
8 years, 5 months
netsurf: branch master updated. release/3.2-539-gc6ada5c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/c6ada5c089c4c3649dbf2...
...commit http://git.netsurf-browser.org/netsurf.git/commit/c6ada5c089c4c3649dbf265...
...tree http://git.netsurf-browser.org/netsurf.git/tree/c6ada5c089c4c3649dbf26513...
The branch, master has been updated
via c6ada5c089c4c3649dbf2651386b016e2335c8ba (commit)
from 3d514d5334f4922762c144953217e96eeb3a8c86 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=c6ada5c089c4c3649db...
commit c6ada5c089c4c3649dbf2651386b016e2335c8ba
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Cope with freebsd gdk paths
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index b1a6f61..e7952bb 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -88,7 +88,11 @@ define convert_image
S_PIXBUF += $(2)
$(2): $(1)
+ifeq ($(HOST),FreeBSD)
+ $(Q)echo "#include <gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h>" > $(2)
+else
$(Q)echo "#include <gdk-pixbuf/gdk-pixdata.h>" > $(2)
+endif
$(Q)gdk-pixbuf-csource --extern --struct --name=$(3) $(1) >> $(2) || \
( rm -f $(2) && false )
-----------------------------------------------------------------------
Summary of changes:
gtk/Makefile.target | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/gtk/Makefile.target b/gtk/Makefile.target
index b1a6f61..e7952bb 100644
--- a/gtk/Makefile.target
+++ b/gtk/Makefile.target
@@ -88,7 +88,11 @@ define convert_image
S_PIXBUF += $(2)
$(2): $(1)
+ifeq ($(HOST),FreeBSD)
+ $(Q)echo "#include <gdk-pixbuf-2.0/gdk-pixbuf/gdk-pixdata.h>" > $(2)
+else
$(Q)echo "#include <gdk-pixbuf/gdk-pixdata.h>" > $(2)
+endif
$(Q)gdk-pixbuf-csource --extern --struct --name=$(3) $(1) >> $(2) || \
( rm -f $(2) && false )
--
NetSurf Browser
8 years, 5 months
buildsystem: branch master updated. release/1.2-9-gb03375c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/buildsystem.git/shortlog/b03375c5c3091d883...
...commit http://git.netsurf-browser.org/buildsystem.git/commit/b03375c5c3091d88373...
...tree http://git.netsurf-browser.org/buildsystem.git/tree/b03375c5c3091d88373eb...
The branch, master has been updated
via b03375c5c3091d88373eb9d3d602044e74889982 (commit)
from 59f9a1b614f0bdfca35857ce88e3ec0e351a0f00 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/buildsystem.git/commit/?id=b03375c5c3091d8...
commit b03375c5c3091d88373eb9d3d602044e74889982
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
add freebsd to buildsystem tooling
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 129d979..8a104d7 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -101,6 +101,14 @@ ifeq ($(BUILD),$(HOST))
FLEX ?= gflex
endif
+
+ ifeq ($(findstring freebsd,$(HOST)),freebsd)
+ # Building on+for FreeBSD
+ CFLAGS := $(CFLAGS) -I$(GCCSDK_INSTALL_ENV)/include -I/usr/local/include
+ CXXFLAGS := $(CXXFLAGS) -I$(GCCSDK_INSTALL_ENV)/include -I/usr/local/include
+ LDFLAGS := $(LDFLAGS) -L$(GCCSDK_INSTALL_ENV)/lib -L/usr/local/lib
+ endif
+
else
# Cross compiling
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.tools | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 129d979..8a104d7 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -101,6 +101,14 @@ ifeq ($(BUILD),$(HOST))
FLEX ?= gflex
endif
+
+ ifeq ($(findstring freebsd,$(HOST)),freebsd)
+ # Building on+for FreeBSD
+ CFLAGS := $(CFLAGS) -I$(GCCSDK_INSTALL_ENV)/include -I/usr/local/include
+ CXXFLAGS := $(CXXFLAGS) -I$(GCCSDK_INSTALL_ENV)/include -I/usr/local/include
+ LDFLAGS := $(LDFLAGS) -L$(GCCSDK_INSTALL_ENV)/lib -L/usr/local/lib
+ endif
+
else
# Cross compiling
--
NetSurf Project build system
8 years, 5 months
netsurf: branch master updated. release/3.2-538-g3d514d5
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/3d514d5334f4922762c14...
...commit http://git.netsurf-browser.org/netsurf.git/commit/3d514d5334f4922762c1449...
...tree http://git.netsurf-browser.org/netsurf.git/tree/3d514d5334f4922762c144953...
The branch, master has been updated
via 3d514d5334f4922762c144953217e96eeb3a8c86 (commit)
from 0e7a8aba9ce54dd9371a32ada888f6ff8472e746 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3d514d5334f4922762c...
commit 3d514d5334f4922762c144953217e96eeb3a8c86
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
do not exit on error from env script
diff --git a/Docs/env.sh b/Docs/env.sh
index c537560..f70f013 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -255,7 +255,7 @@ ns-make-libs()
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
${MAKE} -C ${TARGET_WORKSPACE}/${REPO} $USE_CPUS $*
if [ $? -ne 0 ]; then
- exit $?
+ return $?
fi
done
@@ -263,7 +263,7 @@ ns-make-libs()
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
${MAKE} -C ${TARGET_WORKSPACE}/${REPO} HOST=${HOST} $USE_CPUS $*
if [ $? -ne 0 ]; then
- exit $?
+ return $?
fi
done
}
-----------------------------------------------------------------------
Summary of changes:
Docs/env.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Docs/env.sh b/Docs/env.sh
index c537560..f70f013 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -255,7 +255,7 @@ ns-make-libs()
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
${MAKE} -C ${TARGET_WORKSPACE}/${REPO} $USE_CPUS $*
if [ $? -ne 0 ]; then
- exit $?
+ return $?
fi
done
@@ -263,7 +263,7 @@ ns-make-libs()
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
${MAKE} -C ${TARGET_WORKSPACE}/${REPO} HOST=${HOST} $USE_CPUS $*
if [ $? -ne 0 ]; then
- exit $?
+ return $?
fi
done
}
--
NetSurf Browser
8 years, 5 months
netsurf: branch master updated. release/3.2-537-g0e7a8ab
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/0e7a8aba9ce54dd9371a3...
...commit http://git.netsurf-browser.org/netsurf.git/commit/0e7a8aba9ce54dd9371a32a...
...tree http://git.netsurf-browser.org/netsurf.git/tree/0e7a8aba9ce54dd9371a32ada...
The branch, master has been updated
via 0e7a8aba9ce54dd9371a32ada888f6ff8472e746 (commit)
from d8c3efc3e8eebeb40c10291e92d1bc09eebafc14 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0e7a8aba9ce54dd9371...
commit 0e7a8aba9ce54dd9371a32ada888f6ff8472e746
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Improve env script packe install for freebsd
diff --git a/Docs/env.sh b/Docs/env.sh
index 2b8e578..c537560 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -168,6 +168,22 @@ ns-pkgman-install()
pkgman install $(echo ${NS_DEV_HPKG})
}
+# MAC OS X
+NS_DEV_MACPORT="git expat openssl curl libjpeg-turbo libpng"
+
+ns-macport-install()
+{
+ PATH=/opt/local/bin:/opt/local/sbin:$PATH sudo /opt/local/bin/port install $(echo ${NS_DEV_MACPORT})
+}
+
+NS_DEV_FREEBSDPKG="gmake curl"
+
+# FreeBSD package install
+ns-freebsdpkg-install()
+{
+ pkg install $(echo ${NS_DEV_FREEBSDPKG})
+}
+
# generic for help text
NS_DEV_GEN="git, gcc, pkgconfig, expat library, openssl library, spidermonkey-1.8.5 library, libcurl, perl, perl MD5 digest, libjpeg library, libpng library"
NS_TOOL_GEN="flex tool, bison tool"
@@ -177,13 +193,6 @@ else
NS_GTK_GEN="gtk+ 2 toolkit library, librsvg2 library"
fi
-NS_DEV_MACPORT="git expat openssl curl libjpeg-turbo libpng"
-
-ns-macport-install()
-{
- PATH=/opt/local/bin:/opt/local/sbin:$PATH sudo /opt/local/bin/port install $(echo ${NS_DEV_MACPORT})
-}
-
# Genertic OS package install
# looks for package managers and tries to use them if present
ns-package-install()
@@ -196,6 +205,8 @@ ns-package-install()
ns-pkgman-install
elif [ -x "/opt/local/bin/port" ]; then
ns-macport-install
+ elif [ -x "/usr/sbin/pkg" ]; then
+ ns-freebsdpkg-install
else
echo "Unable to determine OS packaging system in use."
echo "Please ensure development packages are installed for:"
@@ -210,7 +221,7 @@ ns-pull()
{
for REPO in ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS} ${NS_BROWSER} ; do
echo -n " GIT: Pulling ${REPO}: "
- if [ -f ${TARGET_WORKSPACE}/${REPO}/.git/config ]; then
+ if [ -f "${TARGET_WORKSPACE}/${REPO}/.git/config" ]; then
(cd ${TARGET_WORKSPACE}/${REPO} && git pull $*; )
else
echo "Repository not present"
@@ -232,7 +243,7 @@ ns-clone()
done
# put current env.sh in place in workspace
- if [ ! -f "${TARGET_WORKSPACE}/env.sh" -a -f ${TARGET_WORKSPACE}/${NS_BROWSER}/Docs/env.sh ];then
+ if [ ! -f "${TARGET_WORKSPACE}/env.sh" -a -f ${TARGET_WORKSPACE}/${NS_BROWSER}/Docs/env.sh ]; then
cp ${TARGET_WORKSPACE}/${NS_BROWSER}/Docs/env.sh ${TARGET_WORKSPACE}/env.sh
fi
}
@@ -243,7 +254,7 @@ ns-make-libs()
for REPO in $(echo ${NS_TOOLS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
${MAKE} -C ${TARGET_WORKSPACE}/${REPO} $USE_CPUS $*
- if [ $? -ne 0]; then
+ if [ $? -ne 0 ]; then
exit $?
fi
done
@@ -251,7 +262,7 @@ ns-make-libs()
for REPO in $(echo ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
${MAKE} -C ${TARGET_WORKSPACE}/${REPO} HOST=${HOST} $USE_CPUS $*
- if [ $? -ne 0]; then
+ if [ $? -ne 0 ]; then
exit $?
fi
done
-----------------------------------------------------------------------
Summary of changes:
Docs/env.sh | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/Docs/env.sh b/Docs/env.sh
index 2b8e578..c537560 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -168,6 +168,22 @@ ns-pkgman-install()
pkgman install $(echo ${NS_DEV_HPKG})
}
+# MAC OS X
+NS_DEV_MACPORT="git expat openssl curl libjpeg-turbo libpng"
+
+ns-macport-install()
+{
+ PATH=/opt/local/bin:/opt/local/sbin:$PATH sudo /opt/local/bin/port install $(echo ${NS_DEV_MACPORT})
+}
+
+NS_DEV_FREEBSDPKG="gmake curl"
+
+# FreeBSD package install
+ns-freebsdpkg-install()
+{
+ pkg install $(echo ${NS_DEV_FREEBSDPKG})
+}
+
# generic for help text
NS_DEV_GEN="git, gcc, pkgconfig, expat library, openssl library, spidermonkey-1.8.5 library, libcurl, perl, perl MD5 digest, libjpeg library, libpng library"
NS_TOOL_GEN="flex tool, bison tool"
@@ -177,13 +193,6 @@ else
NS_GTK_GEN="gtk+ 2 toolkit library, librsvg2 library"
fi
-NS_DEV_MACPORT="git expat openssl curl libjpeg-turbo libpng"
-
-ns-macport-install()
-{
- PATH=/opt/local/bin:/opt/local/sbin:$PATH sudo /opt/local/bin/port install $(echo ${NS_DEV_MACPORT})
-}
-
# Genertic OS package install
# looks for package managers and tries to use them if present
ns-package-install()
@@ -196,6 +205,8 @@ ns-package-install()
ns-pkgman-install
elif [ -x "/opt/local/bin/port" ]; then
ns-macport-install
+ elif [ -x "/usr/sbin/pkg" ]; then
+ ns-freebsdpkg-install
else
echo "Unable to determine OS packaging system in use."
echo "Please ensure development packages are installed for:"
@@ -210,7 +221,7 @@ ns-pull()
{
for REPO in ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS} ${NS_BROWSER} ; do
echo -n " GIT: Pulling ${REPO}: "
- if [ -f ${TARGET_WORKSPACE}/${REPO}/.git/config ]; then
+ if [ -f "${TARGET_WORKSPACE}/${REPO}/.git/config" ]; then
(cd ${TARGET_WORKSPACE}/${REPO} && git pull $*; )
else
echo "Repository not present"
@@ -232,7 +243,7 @@ ns-clone()
done
# put current env.sh in place in workspace
- if [ ! -f "${TARGET_WORKSPACE}/env.sh" -a -f ${TARGET_WORKSPACE}/${NS_BROWSER}/Docs/env.sh ];then
+ if [ ! -f "${TARGET_WORKSPACE}/env.sh" -a -f ${TARGET_WORKSPACE}/${NS_BROWSER}/Docs/env.sh ]; then
cp ${TARGET_WORKSPACE}/${NS_BROWSER}/Docs/env.sh ${TARGET_WORKSPACE}/env.sh
fi
}
@@ -243,7 +254,7 @@ ns-make-libs()
for REPO in $(echo ${NS_TOOLS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
${MAKE} -C ${TARGET_WORKSPACE}/${REPO} $USE_CPUS $*
- if [ $? -ne 0]; then
+ if [ $? -ne 0 ]; then
exit $?
fi
done
@@ -251,7 +262,7 @@ ns-make-libs()
for REPO in $(echo ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
${MAKE} -C ${TARGET_WORKSPACE}/${REPO} HOST=${HOST} $USE_CPUS $*
- if [ $? -ne 0]; then
+ if [ $? -ne 0 ]; then
exit $?
fi
done
--
NetSurf Browser
8 years, 5 months
netsurf: branch master updated. release/3.2-536-gd8c3efc
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/d8c3efc3e8eebeb40c102...
...commit http://git.netsurf-browser.org/netsurf.git/commit/d8c3efc3e8eebeb40c10291...
...tree http://git.netsurf-browser.org/netsurf.git/tree/d8c3efc3e8eebeb40c10291e9...
The branch, master has been updated
via d8c3efc3e8eebeb40c10291e92d1bc09eebafc14 (commit)
from facaa0a8292091074ceaf3558ea1b938e23ac213 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=d8c3efc3e8eebeb40c1...
commit d8c3efc3e8eebeb40c10291e92d1bc09eebafc14
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
update env script for freebsd using gmake
diff --git a/Docs/env.sh b/Docs/env.sh
index 3456c4d..2b8e578 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -60,6 +60,9 @@ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PREFIX}/lib
export PATH=${PATH}:${PREFIX}/bin
export NETSURF_GTK_MAJOR
+# make tool
+MAKE=make
+
# NetSurf GIT repositories
NS_GIT="git://git.netsurf-browser.org"
@@ -69,6 +72,7 @@ NS_INTERNAL_LIBS="buildsystem libwapcaplet libparserutils libhubbub libdom libcs
# The browser itself
NS_BROWSER="netsurf"
+
# add target specific libraries
case "${HOST}" in
i586-pc-haiku)
@@ -101,6 +105,14 @@ case "${HOST}" in
# default additional internal libraries
NS_FRONTEND_LIBS="libsvgtiny"
;;
+ *-unknown-freebsd*)
+ # tools required to build the browser for freebsd
+ NS_TOOLS=""
+ # libraries required for the freebsd frontend
+ NS_FRONTEND_LIBS=""
+ # select gnu make
+ MAKE=gmake
+ ;;
*)
# default tools required to build the browser
NS_TOOLS="nsgenbind"
@@ -109,6 +121,8 @@ case "${HOST}" in
;;
esac
+export MAKE
+
################ OS Package installation ################
# deb packages for dpkg based systems
@@ -228,7 +242,7 @@ ns-make-libs()
{
for REPO in $(echo ${NS_TOOLS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
- make -C ${TARGET_WORKSPACE}/${REPO} $USE_CPUS $*
+ ${MAKE} -C ${TARGET_WORKSPACE}/${REPO} $USE_CPUS $*
if [ $? -ne 0]; then
exit $?
fi
@@ -236,7 +250,7 @@ ns-make-libs()
for REPO in $(echo ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
- make -C ${TARGET_WORKSPACE}/${REPO} HOST=${HOST} $USE_CPUS $*
+ ${MAKE} -C ${TARGET_WORKSPACE}/${REPO} HOST=${HOST} $USE_CPUS $*
if [ $? -ne 0]; then
exit $?
fi
@@ -247,7 +261,7 @@ ns-make-libs()
ns-make-libnsfb()
{
echo " MAKE: make -C libnsfb $USE_CPUS $*"
- make -C ${TARGET_WORKSPACE}/libnsfb HOST=${HOST} $USE_CPUS $*
+ ${MAKE} -C ${TARGET_WORKSPACE}/libnsfb HOST=${HOST} $USE_CPUS $*
}
# pulls all repos and makes and installs the libraries and tools
@@ -261,6 +275,6 @@ ns-pull-install()
# Passes appropriate flags to make
ns-make()
{
- make $USE_CPUS "$@"
+ ${MAKE} $USE_CPUS "$@"
}
-----------------------------------------------------------------------
Summary of changes:
Docs/env.sh | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/Docs/env.sh b/Docs/env.sh
index 3456c4d..2b8e578 100644
--- a/Docs/env.sh
+++ b/Docs/env.sh
@@ -60,6 +60,9 @@ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PREFIX}/lib
export PATH=${PATH}:${PREFIX}/bin
export NETSURF_GTK_MAJOR
+# make tool
+MAKE=make
+
# NetSurf GIT repositories
NS_GIT="git://git.netsurf-browser.org"
@@ -69,6 +72,7 @@ NS_INTERNAL_LIBS="buildsystem libwapcaplet libparserutils libhubbub libdom libcs
# The browser itself
NS_BROWSER="netsurf"
+
# add target specific libraries
case "${HOST}" in
i586-pc-haiku)
@@ -101,6 +105,14 @@ case "${HOST}" in
# default additional internal libraries
NS_FRONTEND_LIBS="libsvgtiny"
;;
+ *-unknown-freebsd*)
+ # tools required to build the browser for freebsd
+ NS_TOOLS=""
+ # libraries required for the freebsd frontend
+ NS_FRONTEND_LIBS=""
+ # select gnu make
+ MAKE=gmake
+ ;;
*)
# default tools required to build the browser
NS_TOOLS="nsgenbind"
@@ -109,6 +121,8 @@ case "${HOST}" in
;;
esac
+export MAKE
+
################ OS Package installation ################
# deb packages for dpkg based systems
@@ -228,7 +242,7 @@ ns-make-libs()
{
for REPO in $(echo ${NS_TOOLS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
- make -C ${TARGET_WORKSPACE}/${REPO} $USE_CPUS $*
+ ${MAKE} -C ${TARGET_WORKSPACE}/${REPO} $USE_CPUS $*
if [ $? -ne 0]; then
exit $?
fi
@@ -236,7 +250,7 @@ ns-make-libs()
for REPO in $(echo ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
- make -C ${TARGET_WORKSPACE}/${REPO} HOST=${HOST} $USE_CPUS $*
+ ${MAKE} -C ${TARGET_WORKSPACE}/${REPO} HOST=${HOST} $USE_CPUS $*
if [ $? -ne 0]; then
exit $?
fi
@@ -247,7 +261,7 @@ ns-make-libs()
ns-make-libnsfb()
{
echo " MAKE: make -C libnsfb $USE_CPUS $*"
- make -C ${TARGET_WORKSPACE}/libnsfb HOST=${HOST} $USE_CPUS $*
+ ${MAKE} -C ${TARGET_WORKSPACE}/libnsfb HOST=${HOST} $USE_CPUS $*
}
# pulls all repos and makes and installs the libraries and tools
@@ -261,6 +275,6 @@ ns-pull-install()
# Passes appropriate flags to make
ns-make()
{
- make $USE_CPUS "$@"
+ ${MAKE} $USE_CPUS "$@"
}
--
NetSurf Browser
8 years, 5 months
toolchains: branch master updated. c256843c8c34a9d7138e453c5e1915b4942487dd
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/c256843c8c34a9d713...
...commit http://git.netsurf-browser.org/toolchains.git/commit/c256843c8c34a9d7138e...
...tree http://git.netsurf-browser.org/toolchains.git/tree/c256843c8c34a9d7138e45...
The branch, master has been updated
via c256843c8c34a9d7138e453c5e1915b4942487dd (commit)
from f20bfb5f98b51bfbf9ab6919961541c46dcca19f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=c256843c8c34a9d7...
commit c256843c8c34a9d7138e453c5e1915b4942487dd
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Patch libcurl enough to make it compile for m68k-amigaos/clib2
NB: this does not result in a working curl binary, so libcurl probably doesn't work either.
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p
new file mode 100644
index 0000000..5b6c913
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p
@@ -0,0 +1,11 @@
+--- lib/amigaos.c 2014-06-11 18:52:29.000000000 +0100
++++ lib/amigaos.c 2014-12-20 21:34:06.686013103 +0000
+@@ -22,7 +22,7 @@
+
+ #include "curl_setup.h"
+
+-#if defined(__AMIGA__) && !defined(__ixemul__)
++#if 0
+
+ #include <amitcp/socketbasetags.h>
+
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p
new file mode 100644
index 0000000..de22d82
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p
@@ -0,0 +1,11 @@
+--- lib/amigaos.h 2014-06-11 18:52:29.000000000 +0100
++++ lib/amigaos.h 2014-12-20 21:34:20.390013061 +0000
+@@ -23,7 +23,7 @@
+ ***************************************************************************/
+ #include "curl_setup.h"
+
+-#if defined(__AMIGA__) && !defined(__ixemul__)
++#if 0
+
+ bool Curl_amiga_init();
+ void Curl_amiga_cleanup();
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p
new file mode 100644
index 0000000..c9b9af3
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p
@@ -0,0 +1,10 @@
+--- lib/curl_setup.h 2014-08-25 22:45:11.000000000 +0100
++++ lib/curl_setup.h 2014-12-20 21:35:26.494012868 +0000
+@@ -311,7 +311,6 @@
+ # include <exec/execbase.h>
+ # include <proto/exec.h>
+ # include <proto/dos.h>
+-# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
+ # endif
+ #endif
+
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p
new file mode 100644
index 0000000..3f521af
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p
@@ -0,0 +1,18 @@
+--- src/tool_operate.c.old 2012-10-19 21:42:57.000000000 +0100
++++ src/tool_operate.c 2012-10-19 21:43:27.000000000 +0100
+@@ -1731,15 +1731,6 @@
+ }
+ }
+
+-#ifdef __AMIGA__
+- if(!res && outs.s_isreg && outs.filename) {
+- /* Set the url (up to 80 chars) as comment for the file */
+- if(strlen(url) > 78)
+- url[79] = '\0';
+- SetComment(outs.filename, url);
+- }
+-#endif
+-
+ #ifdef HAVE_UTIME
+ /* File time can only be set _after_ the file has been closed */
+ if(!res && config->remote_time && outs.s_isreg && outs.filename) {
-----------------------------------------------------------------------
Summary of changes:
.../patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p | 11 +++++++++++
.../{ppc-amigaos => m68k-unknown-amigaos}/lib.amigaos.h.p | 6 +++---
.../patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p | 10 ++++++++++
.../src.tool_operate.c.p | 0
4 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p
copy sdk/recipes/patches/libcurl/{ppc-amigaos => m68k-unknown-amigaos}/lib.amigaos.h.p (54%)
create mode 100644 sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p
copy sdk/recipes/patches/libcurl/{ppc-amigaos => m68k-unknown-amigaos}/src.tool_operate.c.p (100%)
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p
new file mode 100644
index 0000000..5b6c913
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p
@@ -0,0 +1,11 @@
+--- lib/amigaos.c 2014-06-11 18:52:29.000000000 +0100
++++ lib/amigaos.c 2014-12-20 21:34:06.686013103 +0000
+@@ -22,7 +22,7 @@
+
+ #include "curl_setup.h"
+
+-#if defined(__AMIGA__) && !defined(__ixemul__)
++#if 0
+
+ #include <amitcp/socketbasetags.h>
+
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p
similarity index 54%
copy from sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
copy to sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p
index 050bea7..de22d82 100644
--- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p
+++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p
@@ -1,11 +1,11 @@
---- lib/amigaos.h.old 2012-10-19 21:36:23.000000000 +0100
-+++ lib/amigaos.h 2012-10-19 21:37:26.000000000 +0100
+--- lib/amigaos.h 2014-06-11 18:52:29.000000000 +0100
++++ lib/amigaos.h 2014-12-20 21:34:20.390013061 +0000
@@ -23,7 +23,7 @@
***************************************************************************/
#include "curl_setup.h"
-#if defined(__AMIGA__) && !defined(__ixemul__)
-+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__))
++#if 0
bool Curl_amiga_init();
void Curl_amiga_cleanup();
diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p
new file mode 100644
index 0000000..c9b9af3
--- /dev/null
+++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p
@@ -0,0 +1,10 @@
+--- lib/curl_setup.h 2014-08-25 22:45:11.000000000 +0100
++++ lib/curl_setup.h 2014-12-20 21:35:26.494012868 +0000
+@@ -311,7 +311,6 @@
+ # include <exec/execbase.h>
+ # include <proto/exec.h>
+ # include <proto/dos.h>
+-# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0)
+ # endif
+ #endif
+
diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p
similarity index 100%
copy from sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p
copy to sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p
--
Cross-compilation toolchains and environments
8 years, 5 months
toolchains: branch master updated. f20bfb5f98b51bfbf9ab6919961541c46dcca19f
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/f20bfb5f98b51bfbf9...
...commit http://git.netsurf-browser.org/toolchains.git/commit/f20bfb5f98b51bfbf9ab...
...tree http://git.netsurf-browser.org/toolchains.git/tree/f20bfb5f98b51bfbf9ab69...
The branch, master has been updated
via f20bfb5f98b51bfbf9ab6919961541c46dcca19f (commit)
from cf639ccf2547de1eae0a17d43ab8de1b28bb3ee4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=f20bfb5f98b51bfb...
commit f20bfb5f98b51bfbf9ab6919961541c46dcca19f
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Get binutils from the 2.14 branch and update gcc to 4.5.4. Add extra curl args.
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 04ee02b..879e9ea 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -1,11 +1,11 @@
-UPSTREAM_GCC_VERSION := 4.5.1
+UPSTREAM_GCC_VERSION := 4.5.4
UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2
UPSTREAM_GCC_URI := http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TAR...
UPSTREAM_BINUTILS_VERSION := 2.14
# Not a tarball; so sue me
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION)
-UPSTREAM_BINUTILS_URI := http://svn.code.sf.net/p/adtools/code/tags/before-merge-with-binutils-2.1...
+UPSTREAM_BINUTILS_URI := http://svn.code.sf.net/p/adtools/code/branches/binutils/$(UPSTREAM_BINUTI...
UPSTREAM_GMP_VERSION := 4.3.2
UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2
diff --git a/sdk/Makefile b/sdk/Makefile
index 8d02603..db054b7 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -128,6 +128,7 @@ endif
ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared --without-random
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver
endif
ifeq ($(SDK_ITEMS),)
-----------------------------------------------------------------------
Summary of changes:
m68k-unknown-amigaos/Makefile | 4 ++--
sdk/Makefile | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 04ee02b..879e9ea 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -1,11 +1,11 @@
-UPSTREAM_GCC_VERSION := 4.5.1
+UPSTREAM_GCC_VERSION := 4.5.4
UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2
UPSTREAM_GCC_URI := http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TAR...
UPSTREAM_BINUTILS_VERSION := 2.14
# Not a tarball; so sue me
UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION)
-UPSTREAM_BINUTILS_URI := http://svn.code.sf.net/p/adtools/code/tags/before-merge-with-binutils-2.1...
+UPSTREAM_BINUTILS_URI := http://svn.code.sf.net/p/adtools/code/branches/binutils/$(UPSTREAM_BINUTI...
UPSTREAM_GMP_VERSION := 4.3.2
UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2
diff --git a/sdk/Makefile b/sdk/Makefile
index 8d02603..db054b7 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -128,6 +128,7 @@ endif
ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS))
EXTRAARGS_LIBCARES := --disable-shared --without-random
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver
endif
ifeq ($(SDK_ITEMS),)
--
Cross-compilation toolchains and environments
8 years, 5 months
toolchains: branch master updated. cf639ccf2547de1eae0a17d43ab8de1b28bb3ee4
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/cf639ccf2547de1eae...
...commit http://git.netsurf-browser.org/toolchains.git/commit/cf639ccf2547de1eae0a...
...tree http://git.netsurf-browser.org/toolchains.git/tree/cf639ccf2547de1eae0a17...
The branch, master has been updated
via cf639ccf2547de1eae0a17d43ab8de1b28bb3ee4 (commit)
from 499e14b8b6b2900d4272278936345a00501dae43 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=cf639ccf2547de1e...
commit cf639ccf2547de1eae0a17d43ab8de1b28bb3ee4
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
Fix usage of autoconf and stop prompting for cvs password
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 1544c74..04ee02b 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -21,8 +21,8 @@ UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL)
UPSTREAM_CLIB2_VERSION := 2010-12-30
-UPSTREAM_CLIB2_TARBALL := clib2
-UPSTREAM_CLIB2_URI := anonymous@clib2.cvs.sourceforge.net:/cvsroot/clib2
+UPSTREAM_CLIB2_TARBALL := clib2-$(UPSTREAM_CLIB2_VERSION).tar.xz
+UPSTREAM_CLIB2_URI := anonymous:@clib2.cvs.sourceforge.net:/cvsroot/clib2
UPSTREAM_NDK_TARBALL := ndk-3.9-includes.tar.bz2
UPSTREAM_NDK_URI := http://kas1e.mikendezign.com/zerohero_crosscompilers_backup/files/m68k-am...
@@ -31,6 +31,12 @@ UPSTREAM_OPENURL_VERSION := 7.15
UPSTREAM_OPENURL_TARBALL := openurl
UPSTREAM_OPENURL_URI := http://svn.code.sf.net/p/openurllib/code/releases/$(UPSTREAM_OPENURL_VERS...
+# need to force the auto* version in use
+GCC_AUTOCONF := autoconf2.64
+GCC_AUTOHEADER := autoheader2.64
+GCC_AUTORECONF := autoreconf2.64
+GCC_AUTOM4TE := autom4te2.64
+
TOP := $(CURDIR)
RECIPES := $(TOP)/recipes
SOURCESDIR := $(TOP)/sources
@@ -44,6 +50,8 @@ TARGET_NAME := m68k-unknown-amigaos
PREFIX ?= /opt/netsurf/$(TARGET_NAME)/cross
+GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)"
+
.PHONY: all clean distclean
all: $(BUILDSTEPS)/stage2.d
@@ -58,8 +66,8 @@ distclean: clean
###
$(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/clib2.d
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make all
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make install
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install
touch $@
###
@@ -67,7 +75,8 @@ $(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/clib2.d
###
$(BUILDSTEPS)/clib2.d: $(BUILDSTEPS)/bootstrap-compiler.d $(BUILDSTEPS)/ndk.d $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL)
- cp -r $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) $(BUILDDIR)/clib2
+ tar xaf $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL)
+ mv library $(BUILDDIR)/clib2
for p in `ls $(RECIPES)/patches/clib2/*.p` ; do patch -d $(BUILDDIR)/clib2 -p0 <$$p ; done
for dir in `find $(RECIPES)/files/clib2/ -type d | grep -v '\.svn' | sed 's#$(RECIPES)/files/clib2##'` ; do mkdir -p $(BUILDDIR)/clib2$$dir ; done
for file in `find $(RECIPES)/files/clib2/ -type f | grep -v '\.svn' | sed 's#$(RECIPES)/files/clib2##'` ; do cp -p $(RECIPES)/files/clib2$$file $(BUILDDIR)/clib2$$file ; done
@@ -94,7 +103,7 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR
###
$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" $(GCC_SRCDIR)/configure \
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \
--prefix=$(PREFIX) \
--target=$(TARGET_NAME) \
--with-cpu=m68040 --disable-threads \
@@ -104,8 +113,8 @@ $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b
--disable-multilib --without-x \
--enable-maintainer-mode --disable-shared \
--without-headers
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc
touch $@
###
@@ -175,7 +184,8 @@ $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL):
cvs -Q -d:pserver:$(UPSTREAM_CLIB2_URI) login
cvs -z9 -d:pserver:$(UPSTREAM_CLIB2_URI) checkout -D $(UPSTREAM_CLIB2_VERSION) library
- mv library $@
+ tar -caf $@ library
+ rm -rf library
$(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL):
wget -q -O $@ $(UPSTREAM_NDK_URI)
-----------------------------------------------------------------------
Summary of changes:
m68k-unknown-amigaos/Makefile | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 1544c74..04ee02b 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -21,8 +21,8 @@ UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL)
UPSTREAM_CLIB2_VERSION := 2010-12-30
-UPSTREAM_CLIB2_TARBALL := clib2
-UPSTREAM_CLIB2_URI := anonymous@clib2.cvs.sourceforge.net:/cvsroot/clib2
+UPSTREAM_CLIB2_TARBALL := clib2-$(UPSTREAM_CLIB2_VERSION).tar.xz
+UPSTREAM_CLIB2_URI := anonymous:@clib2.cvs.sourceforge.net:/cvsroot/clib2
UPSTREAM_NDK_TARBALL := ndk-3.9-includes.tar.bz2
UPSTREAM_NDK_URI := http://kas1e.mikendezign.com/zerohero_crosscompilers_backup/files/m68k-am...
@@ -31,6 +31,12 @@ UPSTREAM_OPENURL_VERSION := 7.15
UPSTREAM_OPENURL_TARBALL := openurl
UPSTREAM_OPENURL_URI := http://svn.code.sf.net/p/openurllib/code/releases/$(UPSTREAM_OPENURL_VERS...
+# need to force the auto* version in use
+GCC_AUTOCONF := autoconf2.64
+GCC_AUTOHEADER := autoheader2.64
+GCC_AUTORECONF := autoreconf2.64
+GCC_AUTOM4TE := autom4te2.64
+
TOP := $(CURDIR)
RECIPES := $(TOP)/recipes
SOURCESDIR := $(TOP)/sources
@@ -44,6 +50,8 @@ TARGET_NAME := m68k-unknown-amigaos
PREFIX ?= /opt/netsurf/$(TARGET_NAME)/cross
+GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)"
+
.PHONY: all clean distclean
all: $(BUILDSTEPS)/stage2.d
@@ -58,8 +66,8 @@ distclean: clean
###
$(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/clib2.d
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make all
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make install
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install
touch $@
###
@@ -67,7 +75,8 @@ $(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/clib2.d
###
$(BUILDSTEPS)/clib2.d: $(BUILDSTEPS)/bootstrap-compiler.d $(BUILDSTEPS)/ndk.d $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL)
- cp -r $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) $(BUILDDIR)/clib2
+ tar xaf $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL)
+ mv library $(BUILDDIR)/clib2
for p in `ls $(RECIPES)/patches/clib2/*.p` ; do patch -d $(BUILDDIR)/clib2 -p0 <$$p ; done
for dir in `find $(RECIPES)/files/clib2/ -type d | grep -v '\.svn' | sed 's#$(RECIPES)/files/clib2##'` ; do mkdir -p $(BUILDDIR)/clib2$$dir ; done
for file in `find $(RECIPES)/files/clib2/ -type f | grep -v '\.svn' | sed 's#$(RECIPES)/files/clib2##'` ; do cp -p $(RECIPES)/files/clib2$$file $(BUILDDIR)/clib2$$file ; done
@@ -94,7 +103,7 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR
###
$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" $(GCC_SRCDIR)/configure \
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \
--prefix=$(PREFIX) \
--target=$(TARGET_NAME) \
--with-cpu=m68040 --disable-threads \
@@ -104,8 +113,8 @@ $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b
--disable-multilib --without-x \
--enable-maintainer-mode --disable-shared \
--without-headers
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc
+ cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc
touch $@
###
@@ -175,7 +184,8 @@ $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL):
cvs -Q -d:pserver:$(UPSTREAM_CLIB2_URI) login
cvs -z9 -d:pserver:$(UPSTREAM_CLIB2_URI) checkout -D $(UPSTREAM_CLIB2_VERSION) library
- mv library $@
+ tar -caf $@ library
+ rm -rf library
$(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL):
wget -q -O $@ $(UPSTREAM_NDK_URI)
--
Cross-compilation toolchains and environments
8 years, 5 months
toolchains: branch master updated. 499e14b8b6b2900d4272278936345a00501dae43
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/499e14b8b6b2900d42...
...commit http://git.netsurf-browser.org/toolchains.git/commit/499e14b8b6b2900d4272...
...tree http://git.netsurf-browser.org/toolchains.git/tree/499e14b8b6b2900d427227...
The branch, master has been updated
via 499e14b8b6b2900d4272278936345a00501dae43 (commit)
from 488befc4e4a21ef6bb2347cae0148002221e965f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=499e14b8b6b2900d...
commit 499e14b8b6b2900d4272278936345a00501dae43
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
add required gmp patch to get it compiling on the CI system
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 3ee99f6..1544c74 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -94,11 +94,16 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR
###
$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" $(GCC_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) \
- --with-cpu=m68040 --disable-threads --disable-nls --disable-c-mbchar \
- --enable-languages=c --enable-checking=no --enable-c99 --with-cross-host \
- --disable-multilib --without-x --enable-maintainer-mode --disable-shared \
- --without-headers
+ cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" $(GCC_SRCDIR)/configure \
+ --prefix=$(PREFIX) \
+ --target=$(TARGET_NAME) \
+ --with-cpu=m68040 --disable-threads \
+ --disable-nls --disable-c-mbchar \
+ --enable-languages=c --enable-checking=no \
+ --enable-c99 --with-cross-host \
+ --disable-multilib --without-x \
+ --enable-maintainer-mode --disable-shared \
+ --without-headers
cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc
cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc
touch $@
@@ -114,11 +119,11 @@ $(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d
touch $@
$(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-step1.d $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL)
- tar xjf $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL)
+ tar xaf $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL)
mv gmp-$(UPSTREAM_GMP_VERSION) $(GCC_SRCDIR)/gmp
- tar xjf $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL)
+ tar xaf $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL)
mv mpfr-$(UPSTREAM_MPFR_VERSION) $(GCC_SRCDIR)/mpfr
- tar xzf $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL)
+ tar xaf $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL)
mv mpc-$(UPSTREAM_MPC_VERSION) $(GCC_SRCDIR)/mpc
touch $@
diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gmp-configure.p b/m68k-unknown-amigaos/recipes/patches/gcc/gmp-configure.p
new file mode 100644
index 0000000..a8ac807
--- /dev/null
+++ b/m68k-unknown-amigaos/recipes/patches/gcc/gmp-configure.p
@@ -0,0 +1,11 @@
+--- gmp/configure.orig 2012-08-17 18:03:57.000000000 +0100
++++ gmp/configure 2012-08-17 18:04:17.000000000 +0100
+@@ -30006,8 +30006,6 @@
+ echo "define(<M4WRAP_SPURIOUS>,<$gmp_cv_m4_m4wrap_spurious>)" >> $gmp_tmpconfigm4
+
+
+-else
+- M4=m4-not-needed
+ fi
+
+ # Only do the GMP_ASM checks if there's a .S or .asm wanting them.
-----------------------------------------------------------------------
Summary of changes:
m68k-unknown-amigaos/Makefile | 21 ++++++++++++--------
.../recipes/patches/gcc/gmp-configure.p | 0
2 files changed, 13 insertions(+), 8 deletions(-)
copy {m5475-atari-mint => m68k-unknown-amigaos}/recipes/patches/gcc/gmp-configure.p (100%)
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 3ee99f6..1544c74 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -94,11 +94,16 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR
###
$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d
- cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" $(GCC_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) \
- --with-cpu=m68040 --disable-threads --disable-nls --disable-c-mbchar \
- --enable-languages=c --enable-checking=no --enable-c99 --with-cross-host \
- --disable-multilib --without-x --enable-maintainer-mode --disable-shared \
- --without-headers
+ cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" $(GCC_SRCDIR)/configure \
+ --prefix=$(PREFIX) \
+ --target=$(TARGET_NAME) \
+ --with-cpu=m68040 --disable-threads \
+ --disable-nls --disable-c-mbchar \
+ --enable-languages=c --enable-checking=no \
+ --enable-c99 --with-cross-host \
+ --disable-multilib --without-x \
+ --enable-maintainer-mode --disable-shared \
+ --without-headers
cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc
cd $(BUILDDIR) && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc
touch $@
@@ -114,11 +119,11 @@ $(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d
touch $@
$(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-step1.d $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL)
- tar xjf $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL)
+ tar xaf $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL)
mv gmp-$(UPSTREAM_GMP_VERSION) $(GCC_SRCDIR)/gmp
- tar xjf $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL)
+ tar xaf $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL)
mv mpfr-$(UPSTREAM_MPFR_VERSION) $(GCC_SRCDIR)/mpfr
- tar xzf $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL)
+ tar xaf $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL)
mv mpc-$(UPSTREAM_MPC_VERSION) $(GCC_SRCDIR)/mpc
touch $@
diff --git a/m5475-atari-mint/recipes/patches/gcc/gmp-configure.p b/m68k-unknown-amigaos/recipes/patches/gcc/gmp-configure.p
similarity index 100%
copy from m5475-atari-mint/recipes/patches/gcc/gmp-configure.p
copy to m68k-unknown-amigaos/recipes/patches/gcc/gmp-configure.p
--
Cross-compilation toolchains and environments
8 years, 5 months