[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [ mxe-octave] Someting starange for stable build
From: |
Tatsuro MATSUOKA |
Subject: |
Re: [ mxe-octave] Someting starange for stable build |
Date: |
Tue, 10 Apr 2018 08:05:44 +0900 (JST) |
----- Original Message -----
> From: John W. Eaton
> To: Tatsuro MATSUOKA "octave-maintainers
> Cc:
> Date: 2018/4/9, Mon 22:26
> Subject: Re: [ mxe-octave] Someting starange for stable build
>
> On 04/09/2018 09:11 AM, Tatsuro MATSUOKA wrote:
>
>>> The "+" indicates that there are some local changes to files
> in the
>>> repo. What changes did you make (what does hg diff show)?
>>>
>>> jwe
>>>
>> I use the directory which is copied from default branch build.
>>
>> I use a tar.gz file that is obtained from native linux build by make all
> dist, and touch stable-octave.mk.
>> the aboves are all that I locally do.
>
> What is the output from running
>
> hg diff
>
> in your mxe-octave repo?
>
> jwe
You are perhaps right.
$ hg diff
diff -r d0503b307fad src/default-octave.mk
--- a/src/default-octave.mk Sat Apr 07 15:42:20 2018 -0400
+++ b/src/default-octave.mk Tue Apr 10 08:03:40 2018 +0900
@@ -6,7 +6,11 @@
PKG := default-octave
$(PKG)_IGNORE :=
+<<<<<<< working copy
+$(PKG)_VERSION := 4.3.0+
+=======
$(PKG)_VERSION := 5.0.0
+>>>>>>> destination
$(PKG)_CHECKSUM := ## No checksum
$(PKG)_SUBDIR := octave-$($(PKG)_VERSION)
$(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz
diff -r d0503b307fad src/epstool.mk
--- a/src/epstool.mk Sat Apr 07 15:42:20 2018 -0400
+++ b/src/epstool.mk Tue Apr 10 08:03:40 2018 +0900
@@ -3,7 +3,7 @@
PKG := epstool
$(PKG)_VERSION := 3.08
-$(PKG)_CHECKSUM := dc495934f06d3ea8b3209e8b02ea96c66c34f614
+$(PKG)_CHECKSUM :=
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL :=
http://pkgs.fedoraproject.org/repo/pkgs/epstool/epstool-3.08.tar.gz/465a57a598dbef411f4ecbfbd7d4c8d7/$($(PKG)_FILE)
diff -r d0503b307fad src/stable-octave.mk
--- a/src/stable-octave.mk Sat Apr 07 15:42:20 2018 -0400
+++ b/src/stable-octave.mk Tue Apr 10 08:03:40 2018 +0900
@@ -9,8 +9,8 @@
$(PKG)_VERSION := 4.3.0+
$(PKG)_CHECKSUM := ## No checksum
$(PKG)_SUBDIR := octave-$($(PKG)_VERSION)
-$(PKG)_FILE := octave-$($(PKG)_VERSION).tar.lz
-$(PKG)_URL := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)
+$(PKG)_FILE := octave-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL :=
ifeq ($(USE_SYSTEM_FONTCONFIG),no)
$(PKG)_FONTCONFIG := fontconfig
endif
I will try clean mxe-build
Tatsuro