source:
patches/systemd-211-compat-1.patch@
89306f9
| Last change on this file since 89306f9 was dd3bdd5, checked in by , 11 years ago | |
|---|---|
|
|
| File size: 9.1 KB | |
-
Makefile.am
Submitted By: William Harrington (kb0iic at cross-lfs dot org) Date: 2014-03-16 Initial Package Version: 211 Origin: LFS-Systemd Upstream Status: Rejected Description: Install pkg-config files when not installing compatible libraries. diff -Naur a/Makefile.am b/Makefile.am
a b 2172 2172 UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook 2173 2173 2174 2174 pkgconfiglib_DATA += \ 2175 src/libsystemd/libsystemd.pc 2175 src/libsystemd/libsystemd.pc \ 2176 src/compat-libs/libsystemd-journal.pc \ 2177 src/compat-libs/libsystemd-login.pc \ 2178 src/compat-libs/libsystemd-id128.pc \ 2179 src/compat-libs/libsystemd-daemon.pc 2176 2180 2177 2181 pkginclude_HEADERS += \ 2178 2182 src/systemd/sd-login.h \ … … 4593 4597 libsystemd-id128.la \ 4594 4598 libsystemd-daemon.la 4595 4599 4596 pkgconfiglib_DATA += \4597 src/compat-libs/libsystemd-journal.pc \4598 src/compat-libs/libsystemd-login.pc \4599 src/compat-libs/libsystemd-id128.pc \4600 src/compat-libs/libsystemd-daemon.pc4601 4602 4600 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed 4603 4601 compat-lib-install-hook: 4604 4602 libname=libsystemd-login.so && $(move-to-rootlibdir) -
Makefile.in
diff -Naur a/Makefile.in b/Makefile.in
a b 1088 1088 @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-id128.la \ 1089 1089 @ENABLE_COMPAT_LIBS_TRUE@ libsystemd-daemon.la 1090 1090 1091 @ENABLE_COMPAT_LIBS_TRUE@am__append_239 = \ 1092 @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-journal.pc \ 1093 @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-login.pc \ 1094 @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-id128.pc \ 1095 @ENABLE_COMPAT_LIBS_TRUE@ src/compat-libs/libsystemd-daemon.pc 1096 1097 @ENABLE_COMPAT_LIBS_TRUE@am__append_240 = compat-lib-install-hook 1098 @ENABLE_COMPAT_LIBS_TRUE@am__append_241 = compat-lib-uninstall-hook 1099 @ENABLE_MANPAGES_TRUE@am__append_242 = \ 1091 @ENABLE_COMPAT_LIBS_TRUE@am__append_239 = compat-lib-install-hook 1092 @ENABLE_COMPAT_LIBS_TRUE@am__append_240 = compat-lib-uninstall-hook 1093 @ENABLE_MANPAGES_TRUE@am__append_241 = \ 1100 1094 @ENABLE_MANPAGES_TRUE@ man/custom-entities.ent 1101 1095 1102 @HAVE_SYSV_COMPAT_TRUE@am__append_24 3= \1096 @HAVE_SYSV_COMPAT_TRUE@am__append_242 = \ 1103 1097 @HAVE_SYSV_COMPAT_TRUE@ docs/sysvinit/README \ 1104 1098 @HAVE_SYSV_COMPAT_TRUE@ docs/var-log/README 1105 1099 1100 @HAVE_SYSV_COMPAT_TRUE@am__append_243 = \ 1101 @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service 1102 1106 1103 @HAVE_SYSV_COMPAT_TRUE@am__append_244 = \ 1107 1104 @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service 1108 1105 … … 1116 1113 @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service 1117 1114 1118 1115 @HAVE_SYSV_COMPAT_TRUE@am__append_248 = \ 1119 @HAVE_SYSV_COMPAT_TRUE@ systemd-update-utmp-runlevel.service1120 1121 @HAVE_SYSV_COMPAT_TRUE@am__append_249 = \1122 1116 @HAVE_SYSV_COMPAT_TRUE@ poweroff.target runlevel0.target \ 1123 1117 @HAVE_SYSV_COMPAT_TRUE@ rescue.target runlevel1.target \ 1124 1118 @HAVE_SYSV_COMPAT_TRUE@ multi-user.target runlevel2.target \ … … 1127 1121 @HAVE_SYSV_COMPAT_TRUE@ graphical.target runlevel5.target \ 1128 1122 @HAVE_SYSV_COMPAT_TRUE@ reboot.target runlevel6.target 1129 1123 1130 @HAVE_SYSV_COMPAT_TRUE@am__append_2 50= \1124 @HAVE_SYSV_COMPAT_TRUE@am__append_249 = \ 1131 1125 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel1.target.wants \ 1132 1126 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel2.target.wants \ 1133 1127 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel3.target.wants \ 1134 1128 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel4.target.wants \ 1135 1129 @HAVE_SYSV_COMPAT_TRUE@ $(systemunitdir)/runlevel5.target.wants 1136 1130 1137 @HAVE_SYSV_COMPAT_TRUE@am__append_25 1= \1131 @HAVE_SYSV_COMPAT_TRUE@am__append_250 = \ 1138 1132 @HAVE_SYSV_COMPAT_TRUE@ --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \ 1139 1133 @HAVE_SYSV_COMPAT_TRUE@ --with-sysvrcnd-path=$$dc_install_base/$(sysvrcnddir) 1140 1134 1141 @HAVE_SYSV_COMPAT_FALSE@am__append_25 2= \1135 @HAVE_SYSV_COMPAT_FALSE@am__append_251 = \ 1142 1136 @HAVE_SYSV_COMPAT_FALSE@ --with-sysvinit-path= \ 1143 1137 @HAVE_SYSV_COMPAT_FALSE@ --with-sysvrcnd-path= 1144 1138 1145 @ENABLE_GTK_DOC_TRUE@am__append_25 3= \1139 @ENABLE_GTK_DOC_TRUE@am__append_252 = \ 1146 1140 @ENABLE_GTK_DOC_TRUE@ --enable-gtk-doc 1147 1141 1148 @ENABLE_COMPAT_LIBS_TRUE@am__append_25 4= \1142 @ENABLE_COMPAT_LIBS_TRUE@am__append_253 = \ 1149 1143 @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_journal_sym_SOURCES) \ 1150 1144 @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_login_sym_SOURCES) \ 1151 1145 @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_id128_sym_SOURCES) \ 1152 1146 @ENABLE_COMPAT_LIBS_TRUE@ $(test_libsystemd_daemon_sym_SOURCES) 1153 1147 1154 @ENABLE_COMPAT_LIBS_TRUE@am__append_25 5= \1148 @ENABLE_COMPAT_LIBS_TRUE@am__append_254 = \ 1155 1149 @ENABLE_COMPAT_LIBS_TRUE@ test-libsystemd-journal-sym \ 1156 1150 @ENABLE_COMPAT_LIBS_TRUE@ test-libsystemd-login-sym \ 1157 1151 @ENABLE_COMPAT_LIBS_TRUE@ test-libsystemd-id128-sym \ … … 4114 4108 $(am__append_211) $(am__append_234) $(nodist_systemunit_DATA) \ 4115 4109 $(nodist_userunit_DATA) $(pkgconfigdata_DATA) \ 4116 4110 $(pkgconfiglib_DATA) $(nodist_polkitpolicy_DATA) \ 4117 $(am__append_24 3) defined undefined4118 DISTCLEANFILES = $(am__append_24 2)4111 $(am__append_242) defined undefined 4112 DISTCLEANFILES = $(am__append_241) 4119 4113 4120 4114 # Really, do not edit this file. 4121 4115 EXTRA_DIST = units/getty@.service.m4 units/serial-getty@.service.m4 \ … … 4306 4300 $(nodist_libudev_core_la_SOURCES) $(am__append_99) \ 4307 4301 $(am__append_235) $(am__append_237) \ 4308 4302 $(test_libsystemd_sym_SOURCES) $(test_libudev_sym_SOURCES) \ 4309 $(am__append_25 4)4303 $(am__append_253) 4310 4304 INSTALL_EXEC_HOOKS = install-target-wants-hook \ 4311 4305 install-directories-hook install-aliases-hook \ 4312 4306 systemd-detect-virt-install-hook $(am__append_78) \ 4313 4307 bus-proxyd-install-hook libsystemd-install-hook \ 4314 4308 libudev-install-hook $(am__append_101) journal-install-hook \ 4315 $(am__append_2 40)4309 $(am__append_239) 4316 4310 UNINSTALL_EXEC_HOOKS = $(am__append_79) bus-proxyd-uninstall-hook \ 4317 4311 libsystemd-uninstall-hook libudev-uninstall-hook \ 4318 $(am__append_102) journal-uninstall-hook $(am__append_24 1)4312 $(am__append_102) journal-uninstall-hook $(am__append_240) 4319 4313 INSTALL_DATA_HOOKS = units-install-hook hwdb-update-hook \ 4320 4314 catalog-update-hook 4321 4315 UNINSTALL_DATA_HOOKS = units-uninstall-hook catalog-remove-hook … … 4353 4347 include_HEADERS = src/libudev/libudev.h 4354 4348 noinst_DATA = $(am__append_49) $(am__append_51) $(am__append_86) 4355 4349 pkgconfiglib_DATA = src/libsystemd/libsystemd.pc \ 4356 src/libudev/libudev.pc $(am__append_97) $(am__append_239) 4350 src/compat-libs/libsystemd-journal.pc \ 4351 src/compat-libs/libsystemd-login.pc \ 4352 src/compat-libs/libsystemd-id128.pc \ 4353 src/compat-libs/libsystemd-daemon.pc src/libudev/libudev.pc \ 4354 $(am__append_97) 4357 4355 polkitpolicy_in_in_files = \ 4358 4356 src/core/org.freedesktop.systemd1.policy.in.in 4359 4357 polkitpolicy_in_files = \ … … 4406 4404 test-journal-verify test-journal-interleaving \ 4407 4405 test-journal-flush test-mmap-cache test-catalog \ 4408 4406 $(am__append_196) $(am__append_209) $(am__append_220) \ 4409 test-libsystemd-sym test-libudev-sym $(am__append_25 5)4407 test-libsystemd-sym test-libudev-sym $(am__append_254) 4410 4408 4411 4409 # ------------------------------------------------------------------------------ 4412 4410 manual_tests = test-engine test-ns test-loopback test-hostname \ … … 4469 4467 # ------------------------------------------------------------------------------ 4470 4468 INSTALL_DIRS = $(am__append_71) $(sysconfdir)/udev/rules.d \ 4471 4469 $(sysconfdir)/udev/hwdb.d $(am__append_125) $(am__append_185) \ 4472 $(am__append_227) $(am__append_2 50) \4470 $(am__append_227) $(am__append_249) \ 4473 4471 $(prefix)/lib/modules-load.d $(sysconfdir)/modules-load.d \ 4474 4472 $(prefix)/lib/systemd/network $(sysconfdir)/systemd/network \ 4475 4473 $(prefix)/lib/sysctl.d $(sysconfdir)/sysctl.d \ … … 4480 4478 $(pkgsysconfdir)/system/getty.target.wants \ 4481 4479 $(pkgsysconfdir)/user $(dbussessionservicedir) \ 4482 4480 $(sysconfdir)/xdg/systemd 4483 RUNLEVEL1_TARGET_WANTS = $(am__append_24 4)4484 RUNLEVEL2_TARGET_WANTS = $(am__append_24 5)4485 RUNLEVEL3_TARGET_WANTS = $(am__append_24 6)4486 RUNLEVEL4_TARGET_WANTS = $(am__append_24 7)4487 RUNLEVEL5_TARGET_WANTS = $(am__append_24 8)4481 RUNLEVEL1_TARGET_WANTS = $(am__append_243) 4482 RUNLEVEL2_TARGET_WANTS = $(am__append_244) 4483 RUNLEVEL3_TARGET_WANTS = $(am__append_245) 4484 RUNLEVEL4_TARGET_WANTS = $(am__append_246) 4485 RUNLEVEL5_TARGET_WANTS = $(am__append_247) 4488 4486 SHUTDOWN_TARGET_WANTS = 4489 4487 LOCAL_FS_TARGET_WANTS = systemd-remount-fs.service tmp.mount 4490 4488 MULTI_USER_TARGET_WANTS = $(am__append_228) getty.target \ … … 4509 4507 USER_BUSNAMES_TARGET_WANTS = $(am__append_165) 4510 4508 SYSTEM_UNIT_ALIASES = $(am__append_155) $(am__append_173) \ 4511 4509 $(am__append_186) $(am__append_202) $(am__append_229) \ 4512 $(am__append_24 9) graphical.target default.target \4510 $(am__append_248) graphical.target default.target \ 4513 4511 reboot.target ctrl-alt-del.target getty@.service \ 4514 4512 autovt@.service 4515 4513 USER_UNIT_ALIASES = $(am__append_166) $(systemunitdir)/shutdown.target \ … … 7270 7268 --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ 7271 7269 --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ 7272 7270 --with-rootprefix=$$dc_install_base --disable-split-usr \ 7273 --enable-kdbus --enable-compat-libs $(am__append_25 1) \7274 $(am__append_25 2) $(am__append_253)7271 --enable-kdbus --enable-compat-libs $(am__append_250) \ 7272 $(am__append_251) $(am__append_252) 7275 7273 www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd 7276 7274 OBJECT_VARIABLES := $(filter %_OBJECTS,$(.VARIABLES)) 7277 7275 ALL_OBJECTS := $(foreach v,$(OBJECT_VARIABLES),$($(v)))
Note:
See TracBrowser
for help on using the repository browser.
