Page MenuHomeFreeBSD
Differential D7253

Add new port databases/sqlitebrowser-qt5 as slaveport of databases/sqlitebrowser
ClosedPublic
Actions

Authored by tcberner on Jul 19 2016, 8:07 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 15, 5:02 AM
Unknown Object (File)
Wed, Apr 9, 11:51 PM
Unknown Object (File)
Mar 14 2025, 8:15 PM
Unknown Object (File)
Feb 22 2025, 11:57 PM
Unknown Object (File)
Jan 25 2025, 9:28 PM
Unknown Object (File)
Jan 25 2025, 9:07 PM
Unknown Object (File)
Dec 23 2024, 11:30 PM
Unknown Object (File)
Dec 23 2024, 4:43 PM
View All Files
Subscribers
riggs

Details

Reviewers
mat
Commits
rP422073: Add new port databases/sqlitebrowser-qt5 as slaveport of databases/sqlitebrowser
Summary

As suggested by Kubilay in Comment #2 of pr 211217 [1] rather than using an option to decide which toolkit to link against, provide both via slaveports.

I opted to not rename the existing port to sqlitebrowser-qt4 [to reduce the changes] -- even though that might be cleaner.

[1] pr211217

Test Plan

Tested in poudriere / system.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Skipped
Unit
Tests Skipped

Event Timeline

tcberner updated this revision to Diff 18564.Jul 19 2016, 8:07 PM
tcberner retitled this revision from to Add new port databases/sqlitebrowser-qt5 as slaveport of databases/sqlitebrowser.
tcberner updated this object.
tcberner edited the test plan for this revision. (Show Details)
tcberner added a reviewer: mat.
tcberner set the repository for this revision to rP FreeBSD ports repository.
mat edited edge metadata.Jul 19 2016, 11:48 PM

Also, when uploading diff manually, use svn diff --diff-cmd=diff -x -U9999 for svn so that the context can be expanded in the web ui. (and git diff -U9999 for git)

databases/sqlitebrowser/Makefile
22

You could check if PKGNAMESUFFIX is empty, or not, and get rid of TOOLKIT_SLAVE.

26

This could go up and be CONFLICTS_INSTALL?=

Also, this could be ${PORTNAME}-qt5-*

tcberner updated this revision to Diff 18578.Jul 20 2016, 6:23 AM
tcberner edited edge metadata.

Add updated diff.

  • Got rid of TOOLKIT, using PKGNAMESUFFIX
  • Moved CONFLICTS_INSTALL?= up
tcberner marked 2 inline comments as done.Jul 20 2016, 6:24 AM

marked changes done.

mat added inline comments.Jul 20 2016, 8:12 AM
databases/sqlitebrowser-qt5/Makefile
6

This can be =

databases/sqlitebrowser/Makefile
8–9

This should be ?=

36–37

This is a gnome thing, and this is a QT port.

40

That could be removed.

tcberner updated this revision to Diff 18598.Jul 20 2016, 4:23 PM
  • Switch the PORTREVISION ?=/=
  • Remove INSTALLS_ICONS
  • Remove @echo
tcberner marked 3 inline comments as done.Jul 20 2016, 4:24 PM

marke comments done.

mat accepted this revision.Jul 20 2016, 10:02 PM
mat edited edge metadata.
mat added inline comments.
databases/sqlitebrowser-qt5/Makefile
11

There could be an empty line above.

This revision is now accepted and ready to land.Jul 20 2016, 10:02 PM
riggs added a subscriber: riggs.Aug 27 2016, 5:01 AM
In D7253#151039, @tcberner wrote:
  • Remove INSTALLS_ICONS

The port does install icons. Shouldn't this one be kept?

mat added a comment.Aug 27 2016, 4:04 PM
In D7253#159345, @riggs wrote:
In D7253#151039, @tcberner wrote:
  • Remove INSTALLS_ICONS

The port does install icons. Shouldn't this one be kept?

INSTALLS_ICONS is a USES=gnome thing.

Closed by commit rP422073: Add new port databases/sqlitebrowser-qt5 as slaveport of databases/sqlitebrowser (authored by tcberner). · Explain WhySep 13 2016, 8:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
databases/
sqlitebrowser-qt5/
11 lines
sqlitebrowser/
14 lines

Diff 18598

View Options

databases/sqlitebrowser-qt5/Makefile

Show All 28 Lines
LDRSRC= ${BOOTSRC}/common LDRSRC= ${BOOTSRC}/common
LIBLUASRC= ${BOOTSRC}/liblua LIBLUASRC= ${BOOTSRC}/liblua
LUASRC= ${SRCTOP}/contrib/lua/src LUASRC= ${SRCTOP}/contrib/lua/src
SASRC= ${BOOTSRC}/libsa SASRC= ${BOOTSRC}/libsa
SYSDIR= ${SRCTOP}/sys SYSDIR= ${SRCTOP}/sys
UBOOTSRC= ${BOOTSRC}/uboot UBOOTSRC= ${BOOTSRC}/uboot
ZFSSRC= ${SASRC}/zfs ZFSSRC= ${SASRC}/zfs
LIBCSRC= ${SRCTOP}/lib/libc LIBCSRC= ${SRCTOP}/lib/libc
WORLDTMP= ${OBJTOP}/tmp
BOOTOBJ= ${OBJTOP}/stand BOOTOBJ= ${OBJTOP}/stand
# BINDIR is where we install # BINDIR is where we install
BINDIR?= /boot BINDIR?= /boot
# LUAPATH is where we search for and install lua scripts. # LUAPATH is where we search for and install lua scripts.
LUAPATH?= /boot/lua LUAPATH?= /boot/lua
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Lines
.endif .endif
# Machine specific flags for all builds here # Machine specific flags for all builds here
# All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc # All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc
# or powerpc64. # or powerpc64.
.if ${MACHINE_ARCH} == "powerpc64" .if ${MACHINE_ARCH} == "powerpc64"
CFLAGS+= -m32 -mcpu=powerpc CFLAGS+= -m32 -mcpu=powerpc
# Use same linker used to link 32 bit binaries
.if "${COMPILER_TYPE}" == "clang" && "${LINKER_TYPE}" == "lld"
bdragonUnsubmitted
Done
Inline Actions

I'm seeing build failures at cleandir stage. I guess LINKER_TYPE isn't being defined at that point. So ${LINKER_TYPE} would need to be wrapped in quotes, or for LINKER_TYPE to be defined at all stages.

bdragon: I'm seeing build failures at cleandir stage. I guess LINKER_TYPE isn't being defined at that…
CFLAGS+= -fuse-ld=${LIB32LD}
impUnsubmitted
Done
Inline Actions

how does LIB32LD get defined? That's 100% opaque to me

imp: how does LIB32LD get defined? That's 100% opaque to me
alfredoAuthorUnsubmitted
Done
Inline Actions

It's defined by in Makefile.libcompat.inc1 and passed to 'stand' by Makefile.inc1 through CROSSENV variable.

alfredo: It's defined by in Makefile.libcompat.inc1 and passed to 'stand' by Makefile.inc1 through…
impUnsubmitted
Not Done
Inline Actions

This will fail when compiled stand alone outside of buildworld.

imp: This will fail when compiled stand alone outside of buildworld.
luporlUnsubmitted
Done
Inline Actions

LIB32LD will be passed to stand either through buildworld or by first performing a 'make buildenv' before changing to stand and trying to build it.

But when trying to build stand without calling buildenv first, LIB32LD will be undefined.
In this case I chose to report an error, informing that LIB32LD must be set when stand is built with clang on powerpc64.

Is that ok? If not, what would be the alternative? Put the LIB32LD detection code in a separate make file that could be included by stand/defs.mk?

luporl: LIB32LD will be passed to stand either through buildworld or by first performing a 'make…
impUnsubmitted
Not Done
Inline Actions

No. I'd say that's not OK. It's almost never OK to have .error statements based on things not being defined. there's too many use cases to know you covered them all.

imp: No. I'd say that's not OK. It's almost never OK to have .error statements based on things not…
impUnsubmitted
Done
Inline Actions

LIB32LD still isn't defined in a file that gets included in the build.
Defining it all in bsd.compat.mk seems fundamentally wrong to me. that's not really what that's for.
If you want to use those things in the rest of the build, you'd need to define it bsd.cpu.mk (which bsd.compat.mk has access to).

imp: LIB32LD still isn't defined in a file that gets included in the build. Defining it all in bsd.
.endif
.endif .endif
# For amd64, there's a bit of mixed bag. Some of the tree (i386, lib*32) is # For amd64, there's a bit of mixed bag. Some of the tree (i386, lib*32) is
# build 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here # build 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here
# and activate it when DO32 is explicitly defined to be 1. # and activate it when DO32 is explicitly defined to be 1.
.if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1 .if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1
CFLAGS+= -m32 CFLAGS+= -m32
# LD_FLAGS is passed directly to ${LD}, not via ${CC}: # LD_FLAGS is passed directly to ${LD}, not via ${CC}:
▲ Show 20 Lines • Show All 128 Lines • Show Last 20 Lines
View Options

databases/sqlitebrowser/Makefile

Show All 28 Lines
LDRSRC= ${BOOTSRC}/common LDRSRC= ${BOOTSRC}/common
LIBLUASRC= ${BOOTSRC}/liblua LIBLUASRC= ${BOOTSRC}/liblua
LUASRC= ${SRCTOP}/contrib/lua/src LUASRC= ${SRCTOP}/contrib/lua/src
SASRC= ${BOOTSRC}/libsa SASRC= ${BOOTSRC}/libsa
SYSDIR= ${SRCTOP}/sys SYSDIR= ${SRCTOP}/sys
UBOOTSRC= ${BOOTSRC}/uboot UBOOTSRC= ${BOOTSRC}/uboot
ZFSSRC= ${SASRC}/zfs ZFSSRC= ${SASRC}/zfs
LIBCSRC= ${SRCTOP}/lib/libc LIBCSRC= ${SRCTOP}/lib/libc
WORLDTMP= ${OBJTOP}/tmp
BOOTOBJ= ${OBJTOP}/stand BOOTOBJ= ${OBJTOP}/stand
# BINDIR is where we install # BINDIR is where we install
BINDIR?= /boot BINDIR?= /boot
# LUAPATH is where we search for and install lua scripts. # LUAPATH is where we search for and install lua scripts.
LUAPATH?= /boot/lua LUAPATH?= /boot/lua
▲ Show 20 Lines • Show All 48 Lines • ▼ Show 20 Lines
.endif .endif
# Machine specific flags for all builds here # Machine specific flags for all builds here
# All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc # All PowerPC builds are 32 bit. We have no 64-bit loaders on powerpc
# or powerpc64. # or powerpc64.
.if ${MACHINE_ARCH} == "powerpc64" .if ${MACHINE_ARCH} == "powerpc64"
CFLAGS+= -m32 -mcpu=powerpc CFLAGS+= -m32 -mcpu=powerpc
# Use same linker used to link 32 bit binaries
.if "${COMPILER_TYPE}" == "clang" && "${LINKER_TYPE}" == "lld"
bdragonUnsubmitted
Done
Inline Actions

I'm seeing build failures at cleandir stage. I guess LINKER_TYPE isn't being defined at that point. So ${LINKER_TYPE} would need to be wrapped in quotes, or for LINKER_TYPE to be defined at all stages.

bdragon: I'm seeing build failures at cleandir stage. I guess LINKER_TYPE isn't being defined at that…
CFLAGS+= -fuse-ld=${LIB32LD}
impUnsubmitted
Done
Inline Actions

how does LIB32LD get defined? That's 100% opaque to me

imp: how does LIB32LD get defined? That's 100% opaque to me
alfredoAuthorUnsubmitted
Done
Inline Actions

It's defined by in Makefile.libcompat.inc1 and passed to 'stand' by Makefile.inc1 through CROSSENV variable.

alfredo: It's defined by in Makefile.libcompat.inc1 and passed to 'stand' by Makefile.inc1 through…
impUnsubmitted
Not Done
Inline Actions

This will fail when compiled stand alone outside of buildworld.

imp: This will fail when compiled stand alone outside of buildworld.
luporlUnsubmitted
Done
Inline Actions

LIB32LD will be passed to stand either through buildworld or by first performing a 'make buildenv' before changing to stand and trying to build it.

But when trying to build stand without calling buildenv first, LIB32LD will be undefined.
In this case I chose to report an error, informing that LIB32LD must be set when stand is built with clang on powerpc64.

Is that ok? If not, what would be the alternative? Put the LIB32LD detection code in a separate make file that could be included by stand/defs.mk?

luporl: LIB32LD will be passed to stand either through buildworld or by first performing a 'make…
impUnsubmitted
Not Done
Inline Actions

No. I'd say that's not OK. It's almost never OK to have .error statements based on things not being defined. there's too many use cases to know you covered them all.

imp: No. I'd say that's not OK. It's almost never OK to have .error statements based on things not…
impUnsubmitted
Done
Inline Actions

LIB32LD still isn't defined in a file that gets included in the build.
Defining it all in bsd.compat.mk seems fundamentally wrong to me. that's not really what that's for.
If you want to use those things in the rest of the build, you'd need to define it bsd.cpu.mk (which bsd.compat.mk has access to).

imp: LIB32LD still isn't defined in a file that gets included in the build. Defining it all in bsd.
.endif
.endif .endif
# For amd64, there's a bit of mixed bag. Some of the tree (i386, lib*32) is # For amd64, there's a bit of mixed bag. Some of the tree (i386, lib*32) is
# build 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here # build 32-bit and some 64-bit (lib*, efi). Centralize all the 32-bit magic here
# and activate it when DO32 is explicitly defined to be 1. # and activate it when DO32 is explicitly defined to be 1.
.if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1 .if ${MACHINE_ARCH} == "amd64" && ${DO32:U0} == 1
CFLAGS+= -m32 CFLAGS+= -m32
# LD_FLAGS is passed directly to ${LD}, not via ${CC}: # LD_FLAGS is passed directly to ${LD}, not via ${CC}:
▲ Show 20 Lines • Show All 128 Lines • Show Last 20 Lines