[Pkg-haskell-commits] darcs: haskell-qt: updated build system
Filip Brcic
brcha at gna.org
Sun May 29 18:47:07 UTC 2011
Sun May 29 18:44:31 UTC 2011 Filip Brcic <brcha at gna.org>
* updated build system
Ignore-this: 6b54da31f0e20609f405c943fa105a81
M ./changelog -1 +3
M ./patches/fix_build_system -9 +102
M ./patches/fixes-for-ghc7 -2 +2
M ./rules -1 +8
Sun May 29 18:44:31 UTC 2011 Filip Brcic <brcha at gna.org>
* updated build system
Ignore-this: 6b54da31f0e20609f405c943fa105a81
diff -rN -u old-haskell-qt//changelog new-haskell-qt//changelog
--- old-haskell-qt//changelog 2011-05-29 18:47:07.828340024 +0000
+++ new-haskell-qt//changelog 2011-05-29 18:47:07.832305225 +0000
@@ -1,10 +1,12 @@
haskell-qt (1.1.4.1-1) unstable; urgency=low
+ * Initial release (Closes: #627829)
* Fixed libqws install path
* Added libqt4-opengl-dev to buildreqs
* Added libghc6-opengl-* to buildreqs
* Addapted the package for Debian Haskell Group
* Renamed libqws into libhaskell-qt to make the name more clear
* Fixed the build system to work in a way compatible with hlibrary.mk
+ * Updated rules file to use supplied makefile-based build system as it is about 10x faster
- -- Filip Brcic <brcha at gna.org> Sat, 28 May 2011 20:05:34 +0200
+ -- Filip Brcic <brcha at gna.org> Sun, 29 May 2011 20:43:43 +0200
diff -rN -u old-haskell-qt//patches/fix_build_system new-haskell-qt//patches/fix_build_system
--- old-haskell-qt//patches/fix_build_system 2011-05-29 18:47:07.820310071 +0000
+++ new-haskell-qt//patches/fix_build_system 2011-05-29 18:47:07.832305225 +0000
@@ -1,8 +1,8 @@
Index: haskell-qt-1.1.4.1/Makefile_612px
===================================================================
---- haskell-qt-1.1.4.1.orig/Makefile_612px 2011-05-28 19:01:50.156951967 +0200
-+++ haskell-qt-1.1.4.1/Makefile_612px 2011-05-28 19:02:59.424951993 +0200
-@@ -15,13 +15,13 @@
+--- haskell-qt-1.1.4.1.orig/Makefile_612px 2010-09-02 18:01:40.000000000 +0200
++++ haskell-qt-1.1.4.1/Makefile_612px 2011-05-29 18:44:14.324982817 +0200
+@@ -15,18 +15,17 @@
GHC_VERSION = 6.12.1
VANILLA_WAY = YES
WAYS =
@@ -20,11 +20,55 @@
soext = .so
LIB_LD_OPTS = -package-name qt-1.1.4 -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -lqtc_core -lqtc_gui -lqtc_network -lqtc_opengl -lqtc_tools -lqtc_script
AR = /usr/bin/ar
+ LD = /usr/bin/ld -x
+-GENERATE_DOT_DEPEND = -dep-makefile $(odir)/.depend
+
+ WAY_p_OPTS = -prof
+ WAY_dyn_OPTS = -fPIC -dynamic
+@@ -43,6 +42,8 @@
+ osuf = $(way_)o
+ hisuf = $(way_)hi
+
++GENERATE_DOT_DEPEND = -dep-makefile $(odir)/.$(way_)depend
++
+ ifneq "$(odir)" ""
+ odir_ = $(odir)/
+ else
+@@ -84,17 +85,17 @@
+ # We have to jump through some hoops if we don't want the vanilla way,
+ # as it's handled specially
+ ifneq "$(way) $(VANILLA_WAY)" " NO"
+-all :: $(odir)/.depend $(LIB)
++all :: $(odir)/.$(way_)depend $(LIB)
+ endif
+
+-$(odir)/.depend : $(MAKEFILE)
++$(odir)/.$(way_)depend : $(MAKEFILE)
+ if test ! -d $(odir); then mkdir -p $(odir); fi
+ $(GHC) -M $(GENERATE_DOT_DEPEND) $(foreach way,$(WAYS),-dep-suffix-s -dep-suffix$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(filter-out -split-objs, $(GHC_OPTS)) $(modules)
+ for dir in $(sort $(foreach mod,$(HS_OBJS) $(C_OBJS),$(dir $(mod)))); do \
+ if test ! -d $$dir; then mkdir -p $$dir; fi \
+ done
+
+-include $(odir)/.depend
++include $(odir)/.$(way_)depend
+
+ ifeq "$(way:%dyn=YES)" "YES"
+ $(LIB) : $(HS_OBJS) $(C_OBJS)
+@@ -164,7 +165,7 @@
+ @echo '$(VALUE)="$($(VALUE))"'
+
+ clean :
+- $(RM) $(HS_OBJS) $(C_OBJS) $(LIB) $(GHCI_LIB) $(HS_IFS) .depend
++ $(RM) $(HS_OBJS) $(C_OBJS) $(LIB) $(GHCI_LIB) $(HS_IFS) .$(way_)depend
+ $(RM) -rf $(wildcard $(patsubst %.$(osuf), %_split, $(HS_OBJS)))
+ $(RM) $(wildcard $(patsubst %.$(osuf), %.o-boot, $(HS_OBJS)))
+ $(RM) $(wildcard $(patsubst %.$(osuf), %.hi-boot, $(HS_OBJS)))
Index: haskell-qt-1.1.4.1/Makefile_612pxd
===================================================================
---- haskell-qt-1.1.4.1.orig/Makefile_612pxd 2011-05-28 19:01:50.020951966 +0200
-+++ haskell-qt-1.1.4.1/Makefile_612pxd 2011-05-28 19:03:34.452952004 +0200
-@@ -15,13 +15,13 @@
+--- haskell-qt-1.1.4.1.orig/Makefile_612pxd 2010-09-02 18:01:40.000000000 +0200
++++ haskell-qt-1.1.4.1/Makefile_612pxd 2011-05-29 18:44:59.052982833 +0200
+@@ -15,18 +15,17 @@
GHC_VERSION = 6.12.1
VANILLA_WAY = YES
WAYS =
@@ -42,10 +86,54 @@
soext = .so
LIB_LD_OPTS = -package-name qt-1.1.4 -package $(OpenGL_VERSION) -package $(base_VERSION) -package $(haskell98_VERSION) -lqtc_core -lqtc_gui -lqtc_network -lqtc_opengl -lqtc_tools -lqtc_script
AR = /usr/bin/ar
+ LD = /usr/bin/ld -x
+-GENERATE_DOT_DEPEND = -dep-makefile $(odir)/.dependd
+
+ WAY_p_OPTS = -prof
+ WAY_dyn_OPTS = -fPIC -dynamic
+@@ -43,6 +42,8 @@
+ osuf = $(way_)o
+ hisuf = $(way_)hi
+
++GENERATE_DOT_DEPEND = -dep-makefile $(odir)/.$(way_)dependd
++
+ ifneq "$(odir)" ""
+ odir_ = $(odir)/
+ else
+@@ -84,17 +85,17 @@
+ # We have to jump through some hoops if we don't want the vanilla way,
+ # as it's handled specially
+ ifneq "$(way) $(VANILLA_WAY)" " NO"
+-all :: $(odir)/.dependd $(LIB)
++all :: $(odir)/.$(way_)dependd $(LIB)
+ endif
+
+-$(odir)/.dependd : $(MAKEFILE)
++$(odir)/.$(way_)dependd : $(MAKEFILE)
+ if test ! -d $(odir); then mkdir -p $(odir); fi
+ $(GHC) -M $(GENERATE_DOT_DEPEND) $(foreach way,$(WAYS),-dep-suffix-s -dep-suffix$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(filter-out -split-objs, $(GHC_OPTS)) $(modules)
+ for dir in $(sort $(foreach mod,$(HS_OBJS) $(C_OBJS),$(dir $(mod)))); do \
+ if test ! -d $$dir; then mkdir -p $$dir; fi \
+ done
+
+-include $(odir)/.dependd
++include $(odir)/.$(way_)dependd
+
+ ifeq "$(way:%dyn=YES)" "YES"
+ $(LIB) : $(HS_OBJS) $(C_OBJS)
+@@ -164,7 +165,7 @@
+ @echo '$(VALUE)="$($(VALUE))"'
+
+ clean :
+- $(RM) $(HS_OBJS) $(C_OBJS) $(LIB) $(GHCI_LIB) $(HS_IFS) .dependd
++ $(RM) $(HS_OBJS) $(C_OBJS) $(LIB) $(GHCI_LIB) $(HS_IFS) .$(way_)dependd
+ $(RM) -rf $(wildcard $(patsubst %.$(osuf), %_split, $(HS_OBJS)))
+ $(RM) $(wildcard $(patsubst %.$(osuf), %.o-boot, $(HS_OBJS)))
+ $(RM) $(wildcard $(patsubst %.$(osuf), %.hi-boot, $(HS_OBJS)))
Index: haskell-qt-1.1.4.1/build.pl
===================================================================
---- haskell-qt-1.1.4.1.orig/build.pl 2011-05-28 19:01:50.160951967 +0200
-+++ haskell-qt-1.1.4.1/build.pl 2011-05-28 19:02:08.468951974 +0200
+--- haskell-qt-1.1.4.1.orig/build.pl 2010-09-02 18:01:40.000000000 +0200
++++ haskell-qt-1.1.4.1/build.pl 2011-05-29 17:37:45.456981374 +0200
@@ -305,8 +305,8 @@
$ghcmv = $2;
$ghcsv = $3;
@@ -57,7 +145,12 @@
}
else { die "$ghc not found" };
my $ghclib = `$ghc --print-libdir`;
-@@ -928,7 +928,7 @@
+@@ -924,11 +924,12 @@
+ if ($bld) {
+ if ((not $ghcfv) or $iswin) {
+ sys_ds_pmf $mk, $mk612, $xld, $hp, $hpv, $vogl, $vbse, $vh98, "YES", "", $mngar, $mngld;
++ sys_ds_pmf $mk, $mk612, $xld, $hp, $hpv, $vogl, $vbse, $vh98, "YES", "way=p", $mngar, $mngld;
+ if ($ghcdv && $rs) {
sys_ds_pmf $mk, $mk612d, $xld, $hp, $hpv, $vogl, $vbse, $vh98, "NO", "way=dyn", $mngar, $mngld;
}
if ($iswin && $weld) {
diff -rN -u old-haskell-qt//patches/fixes-for-ghc7 new-haskell-qt//patches/fixes-for-ghc7
--- old-haskell-qt//patches/fixes-for-ghc7 2011-05-29 18:47:07.800346702 +0000
+++ new-haskell-qt//patches/fixes-for-ghc7 2011-05-29 18:47:07.836279519 +0000
@@ -1,7 +1,7 @@
Index: haskell-qt-1.1.4.1/Qtc/Core/Attributes.hs
===================================================================
---- haskell-qt-1.1.4.1.orig/Qtc/Core/Attributes.hs 2011-05-28 18:20:22.636951068 +0200
-+++ haskell-qt-1.1.4.1/Qtc/Core/Attributes.hs 2011-05-28 18:55:36.436951831 +0200
+--- haskell-qt-1.1.4.1.orig/Qtc/Core/Attributes.hs 2011-05-29 17:36:42.540981352 +0200
++++ haskell-qt-1.1.4.1/Qtc/Core/Attributes.hs 2011-05-29 17:53:12.000000000 +0200
@@ -580,7 +580,7 @@
instance (Qstt a (QDialogSc b)) => QsaSlotReject (a) where
diff -rN -u old-haskell-qt//rules new-haskell-qt//rules
--- old-haskell-qt//rules 2011-05-29 18:47:07.796284341 +0000
+++ new-haskell-qt//rules 2011-05-29 18:47:07.836279519 +0000
@@ -10,8 +10,15 @@
[ ! -f qws/Makefile ] || $(MAKE) -C qws distclean
build/libhaskell-qt::
- (cd qws;qmake -recursive)
+ #(cd qws;qmake -recursive)
+ ./build -qm
$(MAKE) -C qws release
install/libhaskell-qt::
$(MAKE) -C qws INSTALL_ROOT=$(CURDIR)/debian/libhaskell-qt install
+ dh_makeshlibs -plibhaskell-qt
+
+build-ghc-stamp: dist-ghc
+ ./build -b
+ $(BUILD_GHC6) --builddir=dist-ghc
+ touch build-ghc-stamp
More information about the Pkg-haskell-commits
mailing list