Skip to contentSkip to conversation

cmake : bump to version 3.0.2

PATCH New Jérémy Rosen 2 participants 8 messages Sep 19, 2014 – Sep 22, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cmake : bump to version 3.0.2

---
 package/cmake/cmake.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/cmake/cmake.mk +2 -2
index bfeb147..e09fddf 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 2.8
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).12.2
+CMAKE_VERSION_MAJOR = 3.0
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
 CMAKE_SITE = http://www.cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3c
 CMAKE_LICENSE_FILES = Copyright.txt
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/1 swig : bump to version 2.0.12

---
 package/swig/swig.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/swig/swig.mk +2 -1
index 79839ea..5efc81c 100644
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-SWIG_VERSION = 2.0.10
+SWIG_MAJOR = 2.0
+SWIG_VERSION = $(SWIG_MAJOR).12
 SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION)
 SWIG_DEPENDENCIES = host-bison
 HOST_SWIG_CONF_OPT = \
Signature · 1 line
2.1.0
#2 lore raw

PATCH 1/1 swig : bump to version 2.0.12

Dear J?r?my Rosen,

Quoted 10 lines · J?r?my Rosen
---
 package/swig/swig.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/swig/swig.mk +0 -0
index 79839ea..5efc81c 100644

package/swig/swig.mk line 8

Quoted 6 lines
package/swig/swig.mk +2 -1
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-SWIG_VERSION = 2.0.10
+SWIG_MAJOR = 2.0
+SWIG_VERSION = $(SWIG_MAJOR).12

This the SWIG_MAJOR variable would only be needed by your next patch that is not ready to be applied, I've reverted to using just SWIG_VERSION and applied your bump.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/1 swig: add symlink to /usr/bin/swig2.0

In reply to Jérémy Rosen

the cmake detection script provided with cmake will first look for a binary called swig2.0 then for a binary called swig

swig-host only installs a binary called swig and gets overridden by the version installed by the host distro. This symlink prevents that from happening

---
 package/swig/swig.mk | 6 ++++++
 1 file changed, 6 insertions(+)
package/swig/swig.mk +6 -0
index 5efc81c..233e97d 100644
@@ -15,4 +15,10 @@ HOST_SWIG_CONF_OPT = \
 SWIG_LICENSE = GPLv3+ BSD-2c BSD-3c
 SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
 
+define SWIG_INSTALL_SYMLINK
+	ln -fs $(HOST_DIR)/usr/bin/swig $(HOST_DIR)/usr/bin/swig$(SWIG_MAJOR)
+endef
+
+HOST_SWIG_POST_INSTALL_HOOKS += SWIG_INSTALL_SYMLINK
+
 $(eval $(host-autotools-package))
Signature · 1 line
2.1.0
#4 lore raw

PATCH 1/1 swig: add symlink to /usr/bin/swig2.0

Dear J?r?my Rosen,

Quoted 6 lines · J?r?my Rosen

the cmake detection script provided with cmake will first look for a binary called swig2.0 then for a binary called swig

swig-host only installs a binary called swig and gets overridden by the version installed by the host distro. This symlink prevents that from happening

I don't understand the explanation: if it looks for a binary called swig, then where's the need to create a swig2.0 symbolic link? How a binary in $(HOST_DIR)/usr/bin can get overridden by the version installed by the host distro?

The SoB line is missing.

package/swig/swig.mk HOST_SWIG_CONF_OPT = \ · line 18

Quoted 9 lines
package/swig/swig.mk +1 -0
index 5efc81c..233e97d 100644
@@ -15,4 +15,10 @@ HOST_SWIG_CONF_OPT = \
 SWIG_LICENSE = GPLv3+ BSD-2c BSD-3c
 SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
 
+define SWIG_INSTALL_SYMLINK

Should be HOST_SWITCH_INSTALL_SYMLINK.

I've marked your patch as "Changes requested" in patchwork.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#5 lore raw

PATCH 1/1 swig: add symlink to /usr/bin/swig2.0

----- Mail original -----

Quoted 13 lines

Dear J?r?my Rosen,

Quoted 9 lines · J?r?my Rosen

the cmake detection script provided with cmake will first look for a
binary called swig2.0 then for a binary called swig

swig-host only installs a binary called swig and gets overridden by the
version installed by the host distro. This symlink prevents that from
happening

Quoted 5 lines

I don't understand the explanation: if it looks for a binary called swig, then where's the need to create a swig2.0 symbolic link? How a binary in $(HOST_DIR)/usr/bin can get overridden by the version installed by the host distro?

The line in FindSwig.mk (part of the cmake package, not swig package)

find_program(SWIG_EXECUTABLE NAMES swig2.0 swig)

This will look in PATH for

* an executable called "swig2.0"
* if it is not found, an executable called "swig"

so if there is a "swig2.0" in /usr/bin it will be used instead of the one called "swig" in $(HOST_DIR)/usr/bin even if the PATH order says otherwise.

currently, host-swig only installs $(HOST_DIR)/usr/bin/swig and the debian package on my host only installs /usr/bin/swig2.0 thus the problem.

(Note that the separate bump of cmake changes the cmake line above to dealwith swig3.0 that has been updated since, but using $(MAJOR_VERSION) deals with it properly)

Quoted 1 line

The SoB line is missing.

OK

Quoted 9 lines
Quoted 9 lines
package/swig/swig.mk +0 -0
index 5efc81c..233e97d 100644
@@ -15,4 +15,10 @@ HOST_SWIG_CONF_OPT = \
 SWIG_LICENSE = GPLv3+ BSD-2c BSD-3c
 SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES
 
Quoted 4 lines

package/swig/swig.mk HOST_SWIG_CONF_OPT = \ · line 18

Quoted 1 line
package/swig/swig.mk +1 -0
+define SWIG_INSTALL_SYMLINK

Should be HOST_SWITCH_INSTALL_SYMLINK.

OK

Quoted 2 lines

I've marked your patch as "Changes requested" in patchwork.

Ok, thx, I'll fix all that, rebase and resubmit

Thx for the review

Quoted 8 lines

Thanks!

Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

#6 lore raw

PATCH 1/1 swig: add symlink to /usr/bin/swig2.0

Hello,

Quoted 10 lines · Jeremy Rosen

The line in FindSwig.mk (part of the cmake package, not swig package)

find_program(SWIG_EXECUTABLE NAMES swig2.0 swig)

This will look in PATH for

* an executable called "swig2.0"
* if it is not found, an executable called "swig"

Quoted 7 lines

so if there is a "swig2.0" in /usr/bin it will be used instead of the one called "swig" in $(HOST_DIR)/usr/bin even if the PATH order says otherwise.

currently, host-swig only installs $(HOST_DIR)/usr/bin/swig and the debian package on my host only installs /usr/bin/swig2.0 thus the problem.

Are you sure we cannot tell CMake explicitly where our swig binary is? Like -DSWIG_EXECUTABLE=/path/to/swig.

Cc'ing Samuel, who should be able to give some hints about this.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#7 lore raw

PATCH 1/1 cmake : bump to version 3.0.2

In reply to Jérémy Rosen

Please do not apply

I just realized I did not remove a patch that was commited upstream,

I will resubmit soon (after proper testing)

Cordialement

J?r?my Rosen
+33 (0)1 42 68 28 04

fight key loggers : write some perl using vim

Open Wide Ingenierie

23, rue Daviel
75013 Paris - France
www.openwide.fr

----- Mail original -----

Quoted 24 lines
---
 package/cmake/cmake.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/cmake/cmake.mk +2 -3
index bfeb147..e09fddf 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-CMAKE_VERSION_MAJOR = 2.8
-CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).12.2
+CMAKE_VERSION_MAJOR = 3.0
+CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2
 CMAKE_SITE = http://www.cmake.org/files/v$(CMAKE_VERSION_MAJOR)
 CMAKE_LICENSE = BSD-3c
 CMAKE_LICENSE_FILES = Copyright.txt
--

2.1.0