ports/ipython-ppapi/Makefile - Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ports/ipython-ppapi/Makefile

Issue 1417223003: Switch from using 'nacl_main' to 'main' entry point (Closed) Base URL: https://chromium.googlesource.com/external/naclports.git@master

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 include $(NACL_SDK_ROOT)/tools/common.mk	5 include $(NACL_SDK_ROOT)/tools/common.mk

6	6

7 TARGET = kernel	7 TARGET = kernel

8 LIBS = freetype bz2 ssl crypto z png readline ncurses	8 LIBS = freetype bz2 ssl crypto z png readline ncurses

9 NACL_LDFLAGS += -lpython2.7 $(NACL_CLI_MAIN_LIB_CPP)

10 PNACL_LDFLAGS += -lpython2.7 $(NACL_CLI_MAIN_LIB_CPP)

11 ifeq ($(TOOLCHAIN),glibc)	9 ifeq ($(TOOLCHAIN),glibc)

12 LIBS += util dl	10 LIBS += util dl

13 NACL_LDFLAGS += -Wl,-export-dynamic	11 NACL_LDFLAGS += -Wl,-export-dynamic

14 else	12 else

15 LIBS += glibc-compat	13 LIBS += glibc-compat

16 endif	14 endif

17 SOURCES = kernel.cc	15 SOURCES = kernel.cc

18 INC_PATHS = $(NACLPORTS_INCLUDE)/python2.7	16 INC_PATHS = $(NACLPORTS_INCLUDE)/python2.7

19 INSTALL_DIR = $(NACL_PACKAGES_PUBLISH)/ipython/$(TOOLCHAIN)	17 INSTALL_DIR = $(NACL_PACKAGES_PUBLISH)/ipython/$(TOOLCHAIN)

20	18

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
53 install:	51 install:

54 mkdir -p $(INSTALL_DIR)	52 mkdir -p $(INSTALL_DIR)

55 tar -h -c -C ${NACL_PREFIX} -f $(INSTALL_DIR)/pydata_$(NACL_ARCH).tar li b/python2.7 ${EXTRA_ASSETS}	53 tar -h -c -C ${NACL_PREFIX} -f $(INSTALL_DIR)/pydata_$(NACL_ARCH).tar li b/python2.7 ${EXTRA_ASSETS}

56 cp $(OUTDIR)/$(TARGET)*$(EXEEXT) $(INSTALL_DIR)	54 cp $(OUTDIR)/$(TARGET)*$(EXEEXT) $(INSTALL_DIR)

57 rm -f $(INSTALL_DIR)/_unstripped$(EXEEXT)	55 rm -f $(INSTALL_DIR)/_unstripped$(EXEEXT)

58 cp $(OUTDIR)/$(TARGET).nmf $(INSTALL_DIR)	56 cp $(OUTDIR)/$(TARGET).nmf $(INSTALL_DIR)

59 cp kernel.py $(INSTALL_DIR)	57 cp kernel.py $(INSTALL_DIR)

60 ifeq ($(TOOLCHAIN),glibc)	58 ifeq ($(TOOLCHAIN),glibc)

61 cp -r $(OUTDIR)/lib* $(INSTALL_DIR)	59 cp -r $(OUTDIR)/lib* $(INSTALL_DIR)

62 endif	60 endif

OLD	NEW

« no previous file with comments | « ports/harfbuzz/nacl.patch ('k') | ports/ipython-ppapi/build.sh » ('j') | no next file with comments »