[SCM] BOINC packaging branch, SZTAKI, updated. debian/6.10.17+dfsg-3-332-g963a489
Steffen Moeller
moeller at debian.org
Mon Jun 13 23:19:35 UTC 2011
The following commit has been merged in the SZTAKI branch:
commit 963a4899b40b3c698f11bc4e03171cad6994bd9d
Author: Steffen Moeller <moeller at debian.org>
Date: Tue Jun 14 01:19:02 2011 +0200
Modifications of Makefile.am in sched.
diff --git a/SZTAKI_patches_remaining_to_move_into_debian.patch b/SZTAKI_patches_remaining_to_move_into_debian.patch
index 5c917b1..cc37670 100644
--- a/SZTAKI_patches_remaining_to_move_into_debian.patch
+++ b/SZTAKI_patches_remaining_to_move_into_debian.patch
@@ -687,200 +687,6 @@
## other stuff to go into the distribution
-EXTRA_DIST = constraints.sql schema.sql init_db
+EXTRA_DIST = init_db
---- boinc-server-6.11.0+r18946.orig/sched/Makefile.am
-+++ boinc-server-6.11.0+r18946/sched/Makefile.am
-@@ -4,7 +4,8 @@
- include $(top_srcdir)/Makefile.incl
-
- AM_CPPFLAGS += $(MYSQL_CFLAGS) $(PTHREAD_CFLAGS)
--AM_LDFLAGS += -static
-+
-+LDADD = libsched.la
-
- if ENABLE_LIBRARIES
-
-@@ -23,8 +24,8 @@
- libsched_la_SOURCES = $(libsched_sources)
- libsched_la_CFLAGS = $(AM_CPPFLAGS)
- libsched_la_CXXFLAGS = $(AM_CPPFLAGS)
--libsched_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
--libsched_la_LIBADD= $(SSL_LIBS)
-+libsched_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
-+libsched_la_LIBADD = ../lib/libboinc_crypt.la ../lib/libboinc.la $(MYSQL_LIBS)
-
- ## install only headers that are meant for exporting the API !!
- if INSTALL_HEADERS
-@@ -43,41 +44,12 @@
- libsched_fcgi_la_SOURCES = $(libsched_sources)
- libsched_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
- libsched_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
--libsched_fcgi_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
--libsched_fcgi_la_LIBADD=
-+libsched_fcgi_la_LDFLAGS= -rpath $(libdir) -release $(PACKAGE_VERSION)
-+libsched_fcgi_la_LIBADD = ../lib/libboinc_crypt.la ../lib/libboinc_fcgi.la $(MYSQL_LIBS) -lfcgi
-
- endif
- # end of "if ENABLE_FCGI"
-
--# Some OSs may not prefix libraries with lib.
--# For example OS2
--if OS_OS2
--LIBSCHED_STATIC=sched.${LIBEXT}
--LIBSCHED_FCGI_STATIC=sched_fcgi.${LIBEXT}
--else
--LIBSCHED_STATIC=libsched.${LIBEXT}
--LIBSCHED_FCGI_STATIC=libsched_fcgi.${LIBEXT}
--endif
--
--
--if BUILD_STATIC_LIBS
--all_local = $(LIBSCHED_STATIC)
--if ENABLE_FCGI
--all_local += $(LIBSCHED_FCGI_STATIC)
--endif
--endif
--
--all-local: $(all_local)
--
--$(LIBSCHED_STATIC): libsched.la
-- rm -f $(LIBSCHED_STATIC)
-- $(LN) .libs/$(LIBSCHED_STATIC)
--
--$(LIBSCHED_FCGI_STATIC): libsched_fcgi.la
-- rm -f $(LIBSCHED_FCGI_STATIC)
-- $(LN) .libs/$(LIBSCHED_FCGI_STATIC)
--
--
- endif
- # end of "if ENABLE_LIBRARIES
-
-@@ -120,6 +92,8 @@
- # scripts that 'make install' should put in bindir
- bin_SCRIPTS = start stop status
-
-+dist_data_DATA = db_dump_spec.xml
-+
- noinst_HEADERS = \
- assimilate_handler.h \
- handle_request.h \
-@@ -155,29 +129,23 @@
- time_stats_log.cpp
-
- cgi_SOURCES = $(cgi_sources)
--cgi_LDADD = $(SERVERLIBS)
-
- census_SOURCES = \
- census.cpp \
- hr.cpp \
- hr_info.cpp
--census_LDADD = $(SERVERLIBS)
-
- feeder_SOURCES = \
- feeder.cpp \
- hr.cpp \
- hr_info.cpp \
- ../lib/synch.cpp
--feeder_LDADD = $(SERVERLIBS)
-
- wu_check_SOURCES = wu_check.cpp
--wu_check_LDADD = $(SERVERLIBS)
-
- show_shmem_SOURCES = show_shmem.cpp
--show_shmem_LDADD = $(SERVERLIBS)
-
- file_deleter_SOURCES = file_deleter.cpp
--file_deleter_LDADD = $(SERVERLIBS)
-
- VALIDATOR_SOURCES = \
- credit.cpp \
-@@ -187,11 +155,9 @@
-
- sample_bitwise_validator_SOURCES = $(VALIDATOR_SOURCES) \
- sample_bitwise_validator.cpp
--sample_bitwise_validator_LDADD = $(SERVERLIBS)
-
- sample_trivial_validator_SOURCES = $(VALIDATOR_SOURCES) \
- sample_trivial_validator.cpp
--sample_trivial_validator_LDADD = $(SERVERLIBS)
-
- ASSIMILATOR_SOURCES = \
- assimilator.cpp \
-@@ -199,57 +165,40 @@
-
- sample_dummy_assimilator_SOURCES = $(ASSIMILATOR_SOURCES) \
- sample_dummy_assimilator.cpp
--sample_dummy_assimilator_LDADD = $(SERVERLIBS)
-
- sample_assimilator_SOURCES = $(ASSIMILATOR_SOURCES) \
- sample_assimilator.cpp
--sample_assimilator_LDADD = $(SERVERLIBS)
-
- single_job_assimilator_SOURCES = $(ASSIMILATOR_SOURCES) \
- single_job_assimilator.cpp
--single_job_assimilator_LDADD = $(SERVERLIBS)
-
- sample_work_generator_SOURCES = sample_work_generator.cpp
--sample_work_generator_LDADD = $(SERVERLIBS)
-
- db_dump_SOURCES = db_dump.cpp
--db_dump_LDADD = $(SERVERLIBS)
-
- db_purge_SOURCES = db_purge.cpp
--db_purge_LDADD = $(SERVERLIBS)
-
- trickle_handler_SOURCES = trickle_handler.cpp
--trickle_handler_LDADD = $(SERVERLIBS)
-
- update_stats_SOURCES = update_stats.cpp
--update_stats_LDADD = $(SERVERLIBS)
-
- file_upload_handler_SOURCES = file_upload_handler.cpp
--file_upload_handler_LDADD = $(SERVERLIBS)
-
- make_work_SOURCES = make_work.cpp
--make_work_LDADD = $(SERVERLIBS)
-
- transitioner_SOURCES = transitioner.cpp
--transitioner_LDADD = $(SERVERLIBS)
-
- message_handler_SOURCES = message_handler.cpp
--message_handler_LDADD = $(SERVERLIBS)
-
- request_file_list_SOURCES = request_file_list.cpp
--request_file_list_LDADD = $(SERVERLIBS)
-
- get_file_SOURCES = get_file.cpp
--get_file_LDADD = $(SERVERLIBS)
-
- send_file_SOURCES = send_file.cpp
--send_file_LDADD = $(SERVERLIBS)
-
- delete_file_SOURCES = delete_file.cpp
--delete_file_LDADD = $(SERVERLIBS)
-
- sched_driver_SOURCES = sched_driver.cpp
--sched_driver_LDADD = $(SERVERLIBS)
-
- if ENABLE_FCGI
-
-@@ -258,7 +207,7 @@
-
- fcgi_SOURCES = $(cgi_sources)
- fcgi_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
--fcgi_LDADD = $(SERVERLIBS_FCGI)
-+fcgi_LDADD = libsched_fcgi.la
-
-
- fcgi_file_upload_handler_SOURCES = \
-@@ -266,7 +215,7 @@
- sched_config.cpp \
- sched_msgs.cpp
- fcgi_file_upload_handler_CPPFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
--fcgi_file_upload_handler_LDADD = $(SERVERLIBS_FCGI)
-+fcgi_file_upload_handler_LDADD = libsched_fcgi.la
-
- endif
- # end of "if ENABLE_FCGI"
--- boinc-server-6.11.0+r18946.orig/sched/file_deleter.cpp
+++ boinc-server-6.11.0+r18946/sched/file_deleter.cpp
@@ -133,7 +133,7 @@
diff --git a/debian/patches/local_sztaki_nostaticMakefileSched.patch b/debian/patches/local_sztaki_nostaticMakefileSched.patch
new file mode 100644
index 0000000..904ed59
--- /dev/null
+++ b/debian/patches/local_sztaki_nostaticMakefileSched.patch
@@ -0,0 +1,40 @@
+Index: boinc/sched/Makefile.am
+===================================================================
+--- boinc.orig/sched/Makefile.am 2011-06-14 01:13:53.000000000 +0200
++++ boinc/sched/Makefile.am 2011-06-14 01:14:49.000000000 +0200
+@@ -53,35 +53,6 @@
+ endif
+ # end of "if ENABLE_FCGI"
+
+-# Some OSs may not prefix libraries with lib.
+-# For example OS2
+-if OS_OS2
+-LIBSCHED_STATIC=sched.${LIBEXT}
+-LIBSCHED_FCGI_STATIC=sched_fcgi.${LIBEXT}
+-else
+-LIBSCHED_STATIC=libsched.${LIBEXT}
+-LIBSCHED_FCGI_STATIC=libsched_fcgi.${LIBEXT}
+-endif
+-
+-
+-if BUILD_STATIC_LIBS
+-all_local = $(LIBSCHED_STATIC)
+-if ENABLE_FCGI
+-all_local += $(LIBSCHED_FCGI_STATIC)
+-endif
+-endif
+-
+-all-local: $(all_local)
+-
+-$(LIBSCHED_STATIC): libsched.la
+- rm -f $(LIBSCHED_STATIC)
+- $(LN) .libs/$(LIBSCHED_STATIC) .
+-
+-$(LIBSCHED_FCGI_STATIC): libsched_fcgi.la
+- rm -f $(LIBSCHED_FCGI_STATIC)
+- $(LN) .libs/$(LIBSCHED_FCGI_STATIC) .
+-
+-
+ endif
+ # end of "if ENABLE_LIBRARIES
+
diff --git a/debian/patches/local_sztaki_simplifyMakefileSched.patch b/debian/patches/local_sztaki_simplifyMakefileSched.patch
new file mode 100644
index 0000000..11786e0
--- /dev/null
+++ b/debian/patches/local_sztaki_simplifyMakefileSched.patch
@@ -0,0 +1,36 @@
+Index: boinc/sched/Makefile.am
+===================================================================
+--- boinc.orig/sched/Makefile.am 2011-06-14 01:10:50.000000000 +0200
++++ boinc/sched/Makefile.am 2011-06-14 01:13:29.000000000 +0200
+@@ -4,7 +4,8 @@
+ include $(top_srcdir)/Makefile.incl
+
+ AM_CPPFLAGS += $(MYSQL_CFLAGS) $(PTHREAD_CFLAGS)
+-AM_LDFLAGS += -static
++
++LDADD = libsched.la
+
+ if ENABLE_LIBRARIES
+
+@@ -24,8 +25,8 @@
+ libsched_la_SOURCES = $(libsched_sources)
+ libsched_la_CFLAGS = $(AM_CPPFLAGS)
+ libsched_la_CXXFLAGS = $(AM_CPPFLAGS)
+-libsched_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+-libsched_la_LIBADD= $(SSL_LIBS)
++libsched_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
++libsched_la_LIBADD = ../lib/libboinc_crypt.la ../lib/libboinc.la $(MYSQL_LIBS)
+
+ ## install only headers that are meant for exporting the API !!
+ if INSTALL_HEADERS
+@@ -46,8 +47,8 @@
+ libsched_fcgi_la_SOURCES = $(libsched_sources)
+ libsched_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
+ libsched_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
+-libsched_fcgi_la_LDFLAGS= -L$(libdir) -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+-libsched_fcgi_la_LIBADD=
++libsched_fcgi_la_LDFLAGS= -rpath $(libdir) -release $(PACKAGE_VERSION)
++libsched_fcgi_la_LIBADD = ../lib/libboinc_crypt.la ../lib/libboinc_fcgi.la $(MYSQL_LIBS) -lfcgi
+
+ endif
+ # end of "if ENABLE_FCGI"
diff --git a/debian/patches/series b/debian/patches/series
index 3132850..91a904b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,7 @@
local_sztaki_addFilesToMakefileTools.patch
local_sztaki_simplifyMakefileTools.patch
+local_sztaki_simplifyMakefileSched.patch
+local_sztaki_nostaticMakefileSched.patch
local_sztaki_workOnTransitioner.patch
local_sztaki_backendlib.patch
upstream_sztaki_simplerInvocationCmdLine.patch
diff --git a/debian/patches/upstream_sztaki_MakeProjectDeleteSlash.patch b/upstream_sztaki_MakeProjectDeleteSlash.patch
similarity index 100%
copy from debian/patches/upstream_sztaki_MakeProjectDeleteSlash.patch
copy to upstream_sztaki_MakeProjectDeleteSlash.patch
--
BOINC packaging
More information about the pkg-boinc-commits
mailing list