Skip to content

Commit 73d8b6c

Browse files
danielfdickinsonBKPepe
danielfdickinson
authored and
BKPepe
committed
tree-wide: remove obsolete SDK in conditionals
Obsolete use of $(SDK) in configure conditionals can result in dependency errors when building a subset of packages for packages which have multiple sub-packages. The reason it causes dependency issues is that (using libdbi-drivers as an example) lines like: ifneq ($(SDK)$(CONFIG_PACKAGE_libdbd-sqlite3),) always evaluate to true if you are compiling in the SDK. So for a user compiling from the SDK, the configure arguments are always added to the package build. In the case of libdbi-drivers: CONFIGURE_ARGS += \ --with-sqlite3 \ --with-sqlite3-incdir=$(STAGING_DIR)/usr/include \ -with-sqlite3-libdir=$(STAGING_DIR)/usr/lib is always added even if PACKAGE_libdbd-sqlite3 is deselected. When libdbd-sqlite3 is deselected, this dependency: DEPENDS:=libdbi +libsqlite3 is not present, so when configure tries to find sqlite3 it fails. Closes openwrt#28173 "tree-wide: obsolete $(SDK) in conditionals" See also: * "include: remove SDK exception from package install targets" openwrt/openwrt@28f44a4 Performed tree-wide to ease revert if necessary, per: openwrt#28173 (comment) Signed-off-by: Daniel F. Dickinson <[email protected]>
1 parent b0670ac commit 73d8b6c

File tree

6 files changed

+72
-72
lines changed

6 files changed

+72
-72
lines changed

‎lang/php8/Makefile‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -230,25 +230,25 @@ else
230230
CONFIGURE_ARGS+= --disable-intl
231231
endif
232232

233-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-bcmath),)
233+
ifneq ($(CONFIG_PACKAGE_php8-mod-bcmath),)
234234
CONFIGURE_ARGS+= --enable-bcmath=shared
235235
else
236236
CONFIGURE_ARGS+= --disable-bcmath
237237
endif
238238

239-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-calendar),)
239+
ifneq ($(CONFIG_PACKAGE_php8-mod-calendar),)
240240
CONFIGURE_ARGS+= --enable-calendar=shared
241241
else
242242
CONFIGURE_ARGS+= --disable-calendar
243243
endif
244244

245-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-ctype),)
245+
ifneq ($(CONFIG_PACKAGE_php8-mod-ctype),)
246246
CONFIGURE_ARGS+= --enable-ctype=shared
247247
else
248248
CONFIGURE_ARGS+= --disable-ctype
249249
endif
250250

251-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-curl),)
251+
ifneq ($(CONFIG_PACKAGE_php8-mod-curl),)
252252
CONFIGURE_ARGS+= --with-curl=shared
253253
else
254254
CONFIGURE_ARGS+= --without-curl
@@ -260,45 +260,45 @@ else
260260
CONFIGURE_ARGS+= --disable-dom
261261
endif
262262

263-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-exif),)
263+
ifneq ($(CONFIG_PACKAGE_php8-mod-exif),)
264264
CONFIGURE_ARGS+= --enable-exif=shared
265265
else
266266
CONFIGURE_ARGS+= --disable-exif
267267
endif
268268

269-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-fileinfo),)
269+
ifneq ($(CONFIG_PACKAGE_php8-mod-fileinfo),)
270270
CONFIGURE_ARGS+= --enable-fileinfo=shared,"$(STAGING_DIR)/usr"
271271
else
272272
CONFIGURE_ARGS+= --disable-fileinfo
273273
endif
274274

275-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-filter),)
275+
ifneq ($(CONFIG_PACKAGE_php8-mod-filter),)
276276
CONFIGURE_ARGS+= --enable-filter=shared,"$(STAGING_DIR)/usr"
277277
else
278278
CONFIGURE_ARGS+= --disable-filter
279279
endif
280280

281-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-ftp),)
281+
ifneq ($(CONFIG_PACKAGE_php8-mod-ftp),)
282282
CONFIGURE_ARGS+= --enable-ftp=shared
283283
else
284284
CONFIGURE_ARGS+= --disable-ftp
285285
endif
286286

287-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-gd),)
287+
ifneq ($(CONFIG_PACKAGE_php8-mod-gd),)
288288
CONFIGURE_ARGS+= \
289289
--enable-gd=shared,"$(STAGING_DIR)/usr" \
290290
--with-external-gd
291291
else
292292
CONFIGURE_ARGS+= --disable-gd
293293
endif
294294

295-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-gmp),)
295+
ifneq ($(CONFIG_PACKAGE_php8-mod-gmp),)
296296
CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr"
297297
else
298298
CONFIGURE_ARGS+= --without-gmp
299299
endif
300300

301-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-iconv),)
301+
ifneq ($(CONFIG_PACKAGE_php8-mod-iconv),)
302302
ifeq ($(CONFIG_BUILD_NLS),y)
303303
CONFIGURE_VARS+= iconv_impl_name="gnu_libiconv"
304304
CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)"
@@ -310,41 +310,41 @@ else
310310
CONFIGURE_ARGS+= --without-iconv
311311
endif
312312

313-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-ldap),)
313+
ifneq ($(CONFIG_PACKAGE_php8-mod-ldap),)
314314
CONFIGURE_ARGS+= \
315315
--with-ldap=shared,"$(STAGING_DIR)/usr" \
316316
--with-ldap-sasl
317317
else
318318
CONFIGURE_ARGS+= --without-ldap
319319
endif
320320

321-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-mbstring),)
321+
ifneq ($(CONFIG_PACKAGE_php8-mod-mbstring),)
322322
CONFIGURE_ARGS+= \
323323
--enable-mbstring=shared \
324324
--enable-mbregex
325325
else
326326
CONFIGURE_ARGS+= --disable-mbstring
327327
endif
328328

329-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-mysqli),)
329+
ifneq ($(CONFIG_PACKAGE_php8-mod-mysqli),)
330330
CONFIGURE_ARGS+= --with-mysqli=shared
331331
else
332332
CONFIGURE_ARGS+= --without-mysqli
333333
endif
334334

335-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-mysqlnd),)
335+
ifneq ($(CONFIG_PACKAGE_php8-mod-mysqlnd),)
336336
CONFIGURE_ARGS+= --enable-mysqlnd=shared
337337
else
338338
CONFIGURE_ARGS+= --disable-mysqlnd
339339
endif
340340

341-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-opcache),)
341+
ifneq ($(CONFIG_PACKAGE_php8-mod-opcache),)
342342
CONFIGURE_ARGS+= --enable-opcache=shared
343343
else
344344
CONFIGURE_ARGS+= --disable-opcache
345345
endif
346346

347-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-openssl)$(CONFIG_PACKAGE_php8-mod-ftp)$(CONFIG_PACKAGE_php8-mod-snmp),)
347+
ifneq ($(CONFIG_PACKAGE_php8-mod-openssl)$(CONFIG_PACKAGE_php8-mod-ftp)$(CONFIG_PACKAGE_php8-mod-snmp),)
348348
CONFIGURE_ARGS+= \
349349
--with-openssl=shared \
350350
--with-kerberos=no \
@@ -353,25 +353,25 @@ else
353353
CONFIGURE_ARGS+= --without-openssl
354354
endif
355355

356-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-pcntl),)
356+
ifneq ($(CONFIG_PACKAGE_php8-mod-pcntl),)
357357
CONFIGURE_ARGS+= --enable-pcntl=shared
358358
else
359359
CONFIGURE_ARGS+= --disable-pcntl
360360
endif
361361

362-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-pdo),)
362+
ifneq ($(CONFIG_PACKAGE_php8-mod-pdo),)
363363
CONFIGURE_ARGS+= --enable-pdo=shared
364-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-pdo-mysql),)
364+
ifneq ($(CONFIG_PACKAGE_php8-mod-pdo-mysql),)
365365
CONFIGURE_ARGS+= --with-pdo-mysql=shared
366366
else
367367
CONFIGURE_ARGS+= --without-pdo-mysql
368368
endif
369-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-pdo-pgsql),)
369+
ifneq ($(CONFIG_PACKAGE_php8-mod-pdo-pgsql),)
370370
CONFIGURE_ARGS+= --with-pdo-pgsql=shared,"$(STAGING_DIR)/usr"
371371
else
372372
CONFIGURE_ARGS+= --without-pdo-pgsql
373373
endif
374-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-pdo-sqlite),)
374+
ifneq ($(CONFIG_PACKAGE_php8-mod-pdo-sqlite),)
375375
CONFIGURE_ARGS+= --with-pdo-sqlite=shared
376376
else
377377
CONFIGURE_ARGS+= --without-pdo-sqlite
@@ -380,32 +380,32 @@ else
380380
CONFIGURE_ARGS+= --disable-pdo
381381
endif
382382

383-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-pgsql),)
383+
ifneq ($(CONFIG_PACKAGE_php8-mod-pgsql),)
384384
CONFIGURE_ARGS+= --with-pgsql=shared,"$(STAGING_DIR)/usr"
385385
else
386386
CONFIGURE_ARGS+= --without-pgsql
387387
endif
388388

389-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-phar),)
389+
ifneq ($(CONFIG_PACKAGE_php8-mod-phar),)
390390
CONFIGURE_ARGS+= --enable-phar=shared
391391
else
392392
CONFIGURE_ARGS+= --disable-phar
393393
endif
394394

395-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-session),)
395+
ifneq ($(CONFIG_PACKAGE_php8-mod-session),)
396396
CONFIGURE_ARGS+= --enable-session=shared
397397
else
398398
CONFIGURE_ARGS+= --disable-session
399399
endif
400400

401-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-shmop),)
401+
ifneq ($(CONFIG_PACKAGE_php8-mod-shmop),)
402402
CONFIGURE_ARGS+= --enable-shmop=shared
403403
else
404404
CONFIGURE_ARGS+= --disable-shmop
405405
endif
406406

407407
ifeq ($(CONFIG_PHP8_LIBXML),y)
408-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-simplexml),)
408+
ifneq ($(CONFIG_PACKAGE_php8-mod-simplexml),)
409409
CONFIGURE_ARGS+= --enable-simplexml=shared
410410
else
411411
CONFIGURE_ARGS+= --disable-simplexml
@@ -414,7 +414,7 @@ else
414414
CONFIGURE_ARGS+= --disable-simplexml
415415
endif
416416

417-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-snmp),)
417+
ifneq ($(CONFIG_PACKAGE_php8-mod-snmp),)
418418
CONFIGURE_ARGS+= --with-snmp=shared,"$(STAGING_DIR)/usr"
419419
CONFIGURE_VARS+= \
420420
ac_cv_have_decl_usmHMAC192SHA256AuthProtocol=no \
@@ -424,7 +424,7 @@ else
424424
endif
425425

426426
ifeq ($(CONFIG_PHP8_LIBXML),y)
427-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-soap),)
427+
ifneq ($(CONFIG_PACKAGE_php8-mod-soap),)
428428
CONFIGURE_ARGS+= --enable-soap=shared
429429
else
430430
CONFIGURE_ARGS+= --disable-soap
@@ -433,49 +433,49 @@ else
433433
CONFIGURE_ARGS+= --disable-soap
434434
endif
435435

436-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-sockets),)
436+
ifneq ($(CONFIG_PACKAGE_php8-mod-sockets),)
437437
CONFIGURE_ARGS+= --enable-sockets=shared
438438
else
439439
CONFIGURE_ARGS+= --disable-sockets
440440
endif
441441

442-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-sodium),)
442+
ifneq ($(CONFIG_PACKAGE_php8-mod-sodium),)
443443
CONFIGURE_ARGS+= --with-sodium=shared,"$(STAGING_DIR)/usr"
444444
else
445445
CONFIGURE_ARGS+= --without-sodium
446446
endif
447447

448-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-sqlite3),)
448+
ifneq ($(CONFIG_PACKAGE_php8-mod-sqlite3),)
449449
CONFIGURE_ARGS+= --with-sqlite3=shared
450450
else
451451
CONFIGURE_ARGS+= --without-sqlite3
452452
endif
453453

454-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-sysvmsg),)
454+
ifneq ($(CONFIG_PACKAGE_php8-mod-sysvmsg),)
455455
CONFIGURE_ARGS+= --enable-sysvmsg=shared
456456
else
457457
CONFIGURE_ARGS+= --disable-sysvmsg
458458
endif
459459

460-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-sysvsem),)
460+
ifneq ($(CONFIG_PACKAGE_php8-mod-sysvsem),)
461461
CONFIGURE_ARGS+= --enable-sysvsem=shared
462462
else
463463
CONFIGURE_ARGS+= --disable-sysvsem
464464
endif
465465

466-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-sysvshm),)
466+
ifneq ($(CONFIG_PACKAGE_php8-mod-sysvshm),)
467467
CONFIGURE_ARGS+= --enable-sysvshm=shared
468468
else
469469
CONFIGURE_ARGS+= --disable-sysvshm
470470
endif
471471

472-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-tokenizer),)
472+
ifneq ($(CONFIG_PACKAGE_php8-mod-tokenizer),)
473473
CONFIGURE_ARGS+= --enable-tokenizer=shared
474474
else
475475
CONFIGURE_ARGS+= --disable-tokenizer
476476
endif
477477

478-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-xml),)
478+
ifneq ($(CONFIG_PACKAGE_php8-mod-xml),)
479479
CONFIGURE_ARGS+= --enable-xml=shared,"$(STAGING_DIR)/usr"
480480
ifneq ($(CONFIG_PHP8_LIBXML),y)
481481
CONFIGURE_ARGS+= --with-expat
@@ -485,7 +485,7 @@ else
485485
endif
486486

487487
ifeq ($(CONFIG_PHP8_LIBXML),y)
488-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-xmlreader),)
488+
ifneq ($(CONFIG_PACKAGE_php8-mod-xmlreader),)
489489
CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr"
490490
else
491491
CONFIGURE_ARGS+= --disable-xmlreader
@@ -495,7 +495,7 @@ else
495495
endif
496496

497497
ifeq ($(CONFIG_PHP8_LIBXML),y)
498-
ifneq ($(SDK)$(CONFIG_PACKAGE_php8-mod-xmlwriter),)
498+
ifneq ($(CONFIG_PACKAGE_php8-mod-xmlwriter),)
499499
CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr"
500500
else
501501
CONFIGURE_ARGS+= --disable-xmlwriter

‎libs/libdbi-drivers/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ else
7373
CONFIGURE_ARGS += --without-mysql
7474
endif
7575

76-
ifneq ($(SDK)$(CONFIG_PACKAGE_libdbd-pgsql),)
76+
ifneq ($(CONFIG_PACKAGE_libdbd-pgsql),)
7777
CONFIGURE_ARGS += \
7878
--with-pgsql \
7979
--with-pgsql-incdir=$(STAGING_DIR)/usr/include \
@@ -82,7 +82,7 @@ else
8282
CONFIGURE_ARGS += --without-pgsql
8383
endif
8484

85-
ifneq ($(SDK)$(CONFIG_PACKAGE_libdbd-sqlite3),)
85+
ifneq ($(CONFIG_PACKAGE_libdbd-sqlite3),)
8686
CONFIGURE_ARGS += \
8787
--with-sqlite3 \
8888
--with-sqlite3-incdir=$(STAGING_DIR)/usr/include \

0 commit comments

Comments
 (0)