Skip to content

fix: build on arch, close #2 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
starsareintherose wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: build on arch, close #2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Build-LinuxXView.bash.amd64
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if ! [ -d lib/libxview ]; then
fi

# Set the directories that will be used for installation
[ -z "$OPENWINHOME" ] && OPENWINHOME=/usr/openwin
[ -z "$OPENWINHOME" ] && OPENWINHOME=/usr
[ -z "$X11DIR" ] && X11DIR=/usr/X11R6
OWDEST=$DESTDIR$OPENWINHOME
X11DEST=$DESTDIR$X11DIR/lib/X11/config
Expand All @@ -36,8 +36,8 @@ cat > imake.append <<EOF
XVDESTDIR = $OWDEST
EXTRA_DEFINES = -DOPENWINHOME_DEFAULT=\"$OPENWINHOME\" -D_DEFAULT_SOURCE -DSYSV_UCONTEXT
CONFIGDIR = $OPENWINHOME/lib/config
INCLUDES := -I`pwd`/build/include $IMAKE_EXTRA_INCLUDES -I$OWDEST/include \$(INCLUDES)
LOCAL_LDFLAGS := -L`pwd`/lib/libolgx -L`pwd`/lib/libxview $IMAKE_EXTRA_LOCAL_LDFLAGS -L$OWDEST/lib \$(LOCAL_LDFLAGS)
INCLUDES := -I`pwd`/build/include -I/usr/include/tirpc $IMAKE_EXTRA_INCLUDES -I$OWDEST/include \$(INCLUDES)
LOCAL_LDFLAGS := -L`pwd`/lib/libolgx -L`pwd`/lib/libxview -ltirpc $IMAKE_EXTRA_LOCAL_LDFLAGS -L$OWDEST/lib \$(LOCAL_LDFLAGS)
MAKEOVERRIDES =
CFLAGS += -g \$(EXTRA_CFLAGS)
# End of variable-definitions appended by imake-wrapper
Expand Down
2 changes: 1 addition & 1 deletion lib/libxview/misc/i18n_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
#define xv_domain XV_TEXT_DOMAIN
#else /* XGETTEXT */
/* Initial value assigned at xv_init.c */
Xv_private_data CONST char *xv_domain;
Xv_private_data extern CONST char *xv_domain;
#endif /* XGETTEXT */

#define XV_MSG(s) (dgettext(xv_domain, s))
Expand Down
Loading