77 |
77 |
78 PATCH_LEVEL = 0 |
78 PATCH_LEVEL = 0 |
79 |
79 |
80 PKG_MACROS += VIMVER=vim73 |
80 PKG_MACROS += VIMVER=vim73 |
81 |
81 |
82 X_VARIANT = $(BUILD_DIR)/$(MACH32)-gvim |
82 X_VARIANT = $(BUILD_DIR)/$(MACH64)-gvim |
83 NOX_VARIANT = $(BUILD_DIR)/$(MACH32)-vim |
83 NOX_VARIANT = $(BUILD_DIR)/$(MACH64)-vim |
84 |
84 |
85 VARIANTS = $(X_VARIANT) $(NOX_VARIANT) |
85 VARIANTS = $(X_VARIANT) $(NOX_VARIANT) |
86 |
86 |
87 $(VARIANTS:%=%/.configured): BITS=32 |
87 $(VARIANTS:%=%/.configured): BITS=64 |
88 |
88 |
89 BUILD_32 = $(VARIANTS:%=%/.built) |
89 BUILD_64 = $(VARIANTS:%=%/.built) |
90 |
90 |
91 # Only install the non-X variant. We will cherry-pick gvim out of the build |
91 # Only install the non-X variant. We will cherry-pick gvim out of the build |
92 # directory to avoid re-installing everything. |
92 # directory to avoid re-installing everything. |
93 INSTALL_32 = $(NOX_VARIANT)/.installed |
93 INSTALL_64 = $(NOX_VARIANT)/.installed |
94 |
94 |
95 TEST_32 = $(NOX_VARIANT)/.tested |
95 TEST_64 = $(NOX_VARIANT)/.tested |
96 |
96 |
97 # Override a broken imake that's always providing a 64-bit library directory. |
97 # Necessary to pass 64-bit flags to the link stage. |
98 CONFIGURE_OPTIONS += --x-libraries=$(CONFIGURE_LIBDIR.$(BITS)) |
98 CC += $(CC_BITS) |
|
99 |
|
100 # Put all the binaries directly in /usr/bin, not in /usr/bin/64. |
|
101 CONFIGURE_BINDIR.64 = $(CONFIGURE_PREFIX)/bin |
|
102 |
|
103 # Use the 64-bit versions of pkg-config files (or GTK+ will add -R/usr/lib) |
|
104 CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" |
|
105 |
|
106 # Necessary to pass 64-bit flags to the compilation stage. |
|
107 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" |
99 CONFIGURE_OPTIONS += --with-features=huge |
108 CONFIGURE_OPTIONS += --with-features=huge |
100 CONFIGURE_OPTIONS += --with-compiledby="the Solaris Userland build environment" |
109 CONFIGURE_OPTIONS += --with-compiledby="the Solaris Userland build environment" |
101 CONFIGURE_OPTIONS += --with-modified-by="Solaris Userland <[email protected]>" |
110 CONFIGURE_OPTIONS += --with-modified-by="Solaris Userland <[email protected]>" |
102 CONFIGURE_OPTIONS += --enable-luainterp=dynamic |
111 CONFIGURE_OPTIONS += --enable-luainterp=dynamic |
103 # XXX Perl compilation fails, for some reason. |
112 # XXX Perl compilation fails, for some reason. |
109 # but perl.h probably does something else to it, not sure what yet. This |
118 # but perl.h probably does something else to it, not sure what yet. This |
110 # also appears to have something to do with PERL_IMPLICIT_CONTEXT. |
119 # also appears to have something to do with PERL_IMPLICIT_CONTEXT. |
111 # CONFIGURE_OPTIONS += --enable-perlinterp=dynamic |
120 # CONFIGURE_OPTIONS += --enable-perlinterp=dynamic |
112 CONFIGURE_OPTIONS += --enable-pythoninterp=dynamic |
121 CONFIGURE_OPTIONS += --enable-pythoninterp=dynamic |
113 CONFIGURE_OPTIONS += --enable-rubyinterp=dynamic |
122 CONFIGURE_OPTIONS += --enable-rubyinterp=dynamic |
114 |
123 CONFIGURE_OPTIONS += --with-ruby-command=$(RUBY.1.9) |
115 # Below option keeps using ruby 1.8, no matter which ruby version is the default. |
|
116 # When ruby 1.9 becomes available, we may change |
|
117 # the below to explicitly call $(RUBY.1.9). |
|
118 CONFIGURE_OPTIONS += --with-ruby-command=$(RUBY.1.8) |
|
119 |
124 |
120 # We build two variants: with and without X support. |
125 # We build two variants: with and without X support. |
121 $(NOX_VARIANT)/.configured: CONFIGURE_OPTIONS += --without-x |
126 $(NOX_VARIANT)/.configured: CONFIGURE_OPTIONS += --without-x |
122 $(NOX_VARIANT)/.configured: CONFIGURE_OPTIONS += --disable-gui |
127 $(NOX_VARIANT)/.configured: CONFIGURE_OPTIONS += --disable-gui |
123 $(NOX_VARIANT)/.configured: CONFIGURE_OPTIONS += --disable-gtktest |
128 $(NOX_VARIANT)/.configured: CONFIGURE_OPTIONS += --disable-gtktest |
136 |
141 |
137 $(BUILD_DIR)/license: $(SOURCE_DIR)/runtime/doc/uganda.txt |
142 $(BUILD_DIR)/license: $(SOURCE_DIR)/runtime/doc/uganda.txt |
138 nawk '/begin of license/ {p=1; getline; next} /end of license/ {p=0} p == 1 {print}' $< > $@ |
143 nawk '/begin of license/ {p=1; getline; next} /end of license/ {p=0} p == 1 {print}' $< > $@ |
139 |
144 |
140 # common targets |
145 # common targets |
141 build: $(BUILD_32) |
146 build: $(BUILD_64) |
142 |
147 |
143 install: $(INSTALL_32) $(X_VARIANT)/.built $(BUILD_DIR)/license |
148 install: $(INSTALL_64) $(X_VARIANT)/.built $(BUILD_DIR)/license |
144 |
149 |
145 test: $(TEST_32) |
150 test: $(TEST_64) |
146 |
151 |
147 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) |
152 BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) |
148 |
153 |
149 include ../../make-rules/depend.mk |
154 include ../../make-rules/depend.mk |