-
Notifications
You must be signed in to change notification settings - Fork 512
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add package vtk7 #1279
Add package vtk7 #1279
Conversation
@@ -8,8 +8,7 @@ $(PKG)_CHECKSUM := 92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9 | |||
$(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) | |||
$(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz | |||
$(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) | |||
$(PKG)_TARGETS := $(BUILD) | |||
$(PKG)_DEPS := | |||
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you need this change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you need this change?
When I first added cmake as a dependency to vtk7 it didn't work. But now I try to reproduce the error and it's gone, so I guess this change isn't needed at all.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you need this change?
So right before the vtk7 package the error triggered:
make: *** No rule to make target '.../mxe/usr/i686-w64-mingw32.static/installed/cmake', needed by '.../mxe/usr/i686-w64-mingw32.static/installed/vtk7'. Stop.
This change made it build, but I don't know what it does.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove cmake
from $(PKG)_DEPS := gcc hdf5 qtbase qttools libpng expat libxml2 jsoncpp cmake tiff
All cross-compiled packages depend on all native packages implicitly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove cmake from $(PKG)_DEPS
done at 32c3e47
All cross-compiled packages depend on all native packages implicitly.
good to know
Please remove trailing whitespaces added by you to several files. |
We have packages vtk and vtk6. New one is vtk7. Maybe we should rename vtk to vtk5? |
I only found two places, which I now removed in 7c3142a. Did I miss more? |
I agree that three VTK packages are too many. |
The package |
From memory, the diff --git a/src/vmime.mk b/src/vmime.mk
index 411b140..a14fde5 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -36,9 +36,9 @@ define $(PKG)_BUILD
.
$(MAKE) -C '$(1)' -j '$(JOBS)'
+ $(MAKE) -C '$(1)' install
$(SED) -i 's,^\(Libs.private:.* \)$(PREFIX)/$(TARGET)/lib/libiconv\.a,\1-liconv,g' $(1)/vmime.pc
$(if $(BUILD_STATIC),$(SED) -i 's/^\(Cflags:.* \)/\1 -DVMIME_STATIC /g' $(1)/vmime.pc)
- $(MAKE) -C '$(1)' install
$(if $(BUILD_SHARED),$(INSTALL) -m644 '$(1)/build/bin/libvmime.dll' '$(PREFIX)/$(TARGET)/bin/')
$(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp'
There aren't any usage statistics, but VTK5 is heavily patched and unable to be easily updated. I'd prefer to drop this package (and switch it's downstream |
The patch doesn't fix the The problem is related to missing See also #1193 (previous attempt to update cmake). It has patches for vmime and other packages. |
Can you move update of cmake to a separate pull request, please? |
Of course! It's modifying the Can you try with
+1 |
I moved vmime related changes to #1287 |
I'm going to create a new pull request which replaces packages |
Similar to vtk6, but this one builds against Qt5. It also uses mxe's CMake package.
I tested it with
i686-w64-mingw32.static
andi686-w64-mingw32.shared
.